Item 223
git_comments:
    git_commits:
    1. summary: Merge branch 'pr/169'
      message: Merge branch 'pr/169' This closes #169
    github_issues:
      github_issues_comments:
        github_pulls:
        1. title: [NETBEANS-54] Module Review o.apache.commons.httpclient
          body: Updated to maven coordinates for external resource : commons-httpclient-3.1.jar (Apache 2.0)
        github_pulls_comments:
        1. Has corrected now usename , email-id with a force push
        2. I pushed the commit to master. This PR is still a bit strange. For some reason you managed to push three commits into this. Two held the same change with different authors and one merged these two commits. Whatever I removed the merge and the commit with the wrong author and so this is done.
        github_pulls_reviews:
          jira_issues:
          1. summary: Clarify the status of donated files from ApacheNetBeansDonation1.zip
            description: Reviewing the software grant [1] provided with the first NetBeans code donation, my understanding is that not all files found in that zip are donated. The grant indicates that the contents of that file [2] ("Code File") are donated "excluding any third-party and separately licensed material contained within the Code File". I don't think we can consider that code ready to release as is, due to the uncertainty that this creates w.r.t to which files are donated and which are not. The zip archive contains about 45'000 files. I see the following options: a) Review all files and include only those which are not "third-party and separately licensed material". How such files are identified needs to be defined and documented, either in scripts under version control or as a set of rules. The review process must be documented and traceable, so that we can go back to it if problems are found in the future. b) Get an updated grant which does not mention such exclusions. If someone sees other options please discuss here or on the NetBeans dev list, referencing this ticket. [1] in svn under private/documents/grants/oracle-america-netbeans.pdf , ASF members have access [2] under http://bits.netbeans.org/download/apache-donation/ - SHA256(ApacheNetBeansDonation1.zip)= 7f2ca0f61953a190613c9a0fbcc1b034084b04a4d55d23c02cefffc354e7c24a
          jira_issues_comments:
          1. For the record, the phrase in the grant does not simply say "excluding any third party or separately licensed material contained within the Code File". Instead, the full phrase is: "excluding any third party or separately licensed material contained within the Code File, such separately licensed material including without limitation the Licensor and third party material specifically identified below, and which may also include material identified in the THIRDPARTYLICENSE.txt file at: https://netbeans.org/downloads/licence/8.2/nb82-THIRDPARTYLICENSE.txt".
          2. I don't necessarily see a problem with option a, i.e., the need to review all files and include only those which are not "third party and separately licensed material". I.e., that would mean doing a check for (a) JAR files and other binaries [of which none will be found, since we removed them prior to doing the donation] and (b) copyright notices. I.e., if we find files that are not licensed to Oracle, we need to evaluate on a case-by-case basis whether they can be released under Apache. We have already gone through that process as part of preparing the ZIP file for donation to Apache and can go through that process again, if needed.
          3. bq. if we find files that are not licensed to Oracle, we need to evaluate on a case-by-case basis whether they can be released under Apache. That's an option indeed, provided someone writes a script to identify those files and assuming their number is not too high. You'll also need some heuristics to classify some files as irrelevant for this analysis, things like small configuration files etc.
          4. body: Yes, we'll document all the steps and processes we'll follow and also track everything here.
            label: documentation
          5. body: Option a is what all newly incubating projects do as part of due diligence IP Clearance. The only difference here is the size of the grant. I agree with Gj that the process for determining which of the files is suitable for Apache Netbeans is under way and needs to be documented here and followed.
            label: documentation
          6. We have set up a Wiki page for processing all the incoming repos from NetBeans, here: https://cwiki.apache.org/confluence/display/NETBEANS/NetBeans+Transition+Process
          7. body: When I was relicensing the jackpot30 repository, I wrote a fairly strict tool (attached as JavaApplication9 for the record - please be warned it is not polished in any way) to do the replace. The tool (intentionally) does not accept different formattings, comment marks, etc. to minimize risk of errors. The only "fuzzy" element the tool accepts are years in the headers (i.e. it does not care too much about years, if they are on particular places). I believe the only files I touched by hand were: -increment-spec-versions (broken license header, only one file with that header in the repo) -cmdline/tool/scripts/jackpot.bat (sole .bat file in the repo, "standard" header AFAIK, didn't seem necessary to put the pattern in the tool) -standard-nbm-license.txt (contains license that is copied into the built modules, replaces with Apache License Version 2.0) -LICENSE -NOTICE Maybe we could use this as a start for the main repository, polish the tool a little and make a collection of all license headers types in the repository (I assume there'd be a few dozens of them, given any detail in formatting, comment characters, etc. will lead to a different license header type). We could manually review just these collected headers, and then relicense the files with those specific headers that are found to be OK (and discuss those that are not OK, should there be any). Then we would be left with files that don't have a license header (like manifests, form files, etc.), and we could discuss which of them need it and how to check their origin. Any insights/opinions?
            label: code-design
          8. This sounds great to me. Let's document this process here: https://cwiki.apache.org/confluence/display/NETBEANS/NetBeans+Transition+Process
          9. bq. Let's document this process here: https://cwiki.apache.org/confluence/display/NETBEANS/NetBeans+Transition+Process I think jira tickets would provide more information than the table found there: what tools are used, explanations about exceptions or edge cases, tips and tricks for next time etc. They can be subtasks of this ticket so the overview stays here.
          10. body: I was trying to look at a tool that would help us categorize licenses in the main sources. The tool is attached in "convert-headers-1.zip". The (current) output is in "categorized-1.zip". It contains 4 kinds of sources: -do-not-have-cddl0: list of files that do not contain string "CDDL" -have-cddl-not-recognized-filetype0: list of files that contain string "CDDL", but the tool cannot (yet) detect the header -lic*: a detected variant of the licence header (normalized - leading comment marks, leading and trailing whitespaces removed, paragraphs joined on one line, copyright years replaced with "<YEARS>"), with a list of files that contain this specific license header -par*: the header above is split by paragraphs, and each unique paragraph gets a "par" file. Seems it may be easier to review the paragraphs rather than the full license headers (which may contain many duplicated text, with just small differences among variants). Currently, the do-not-have-cddl0 list has 14627 files (so we to do some more work to categorize that), the have-cddl-not-recognized-filetype0 has 667 files, there are 155 license header variants, and 132 variants of the license header paragraphs. Any feedback/opinions on this? Does this look like a viable direction?
            label: code-design
          11. Excellent, thanks for all the work on this. I think the most important thing from the Apache perspective is that we document this, by means of an issue, so that we have a reference point later -- possibly years from now -- about what steps we took to establish ownership of the donated code. Gj
          12. body: So, I was looking at (some of) the most commonly used license headers. They are typically like this ("<YEARS>" is automatically added by the attached tool and is supposed to represent a year or a span of years): --- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. Copyright <YEARS> Oracle and/or its affiliates. All rights reserved. Oracle and Java are registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners. The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common Development and Distribution License("CDDL") (collectively, the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the License at http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the specific language governing permissions and limitations under the License. When distributing the software, include this License Header Notice in each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this particular file as subject to the "Classpath" exception as provided by Oracle in the GPL Version 2 section of the License file that accompanied this code. If applicable, add the following below the License Header, with the fields enclosed by brackets [] replaced by your own identifying information: "Portions Copyrighted [year] [name of copyright owner]" Contributor(s): The Original Software is NetBeans. The Initial Developer of the Original Software is Sun Microsystems, Inc. Portions Copyright <YEARS> Sun Microsystems, Inc. All Rights Reserved. If you wish your version of this file to be governed by only the CDDL or only the GPL Version 2, indicate your decision by adding "[Contributor] elects to include this software in this distribution under the [CDDL or GPL Version 2] license." If you do not indicate a single choice of license, a recipient has the option to distribute your version of this file under either the CDDL, the GPL Version 2 or to extend the choice of license to its licensees as provided above. However, if you add GPL Version 2 code and therefore, elected the GPL Version 2 license, then the option applies only if the new code is made subject to such option by the copyright holder. --- Variations I've noted: -the "If you wish..." section moved before "Contributors:" -various whitespace/empty line changes -"Copyright (c) <YEARS> Oracle and/or its affiliates. All rights reserved." instead of "Copyright <YEARS> Oracle and/or its affiliates. All rights reserved." -the "If you wish..." section not included/missing Variants of the Contributors section I've noted: -Portions Copyrighted <YEARS> Sun Microsystems, Inc. -empty section These variations seem minor to me, so if the original text would be OK, the variants should hopefully be OK as well. This should cover headers of files listed in lic10, lic133, lic139, lic23, lic3, lic47, lic52, lic61, lic62, lic68, lic89 from the attached file (converted-1.zip). A header that differs somewhat more is this (e.g. lic145 from the attached file): --- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. Copyright <YEARS> Sun Microsystems, Inc. All rights reserved. The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common Development and Distribution License("CDDL") (collectively, the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the License at http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the specific language governing permissions and limitations under the License. When distributing the software, include this License Header Notice in each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this particular file as subject to the "Classpath" exception as provided by Sun in the GPL Version 2 section of the License file that accompanied this code. If applicable, add the following below the License Header, with the fields enclosed by brackets [] replaced by your own identifying information: "Portions Copyrighted [year] [name of copyright owner]" Contributor(s): The Original Software is NetBeans. The Initial Developer of the Original Software is Sun Microsystems, Inc. Portions Copyright <YEARS> Sun Microsystems, Inc. All Rights Reserved. If you wish your version of this file to be governed by only the CDDL or only the GPL Version 2, indicate your decision by adding "[Contributor] elects to include this software in this distribution under the [CDDL or GPL Version 2] license." If you do not indicate a single choice of license, a recipient has the option to distribute your version of this file under either the CDDL, the GPL Version 2 or to extend the choice of license to its licensees as provided above. However, if you add GPL Version 2 code and therefore, elected the GPL Version 2 license, then the option applies only if the new code is made subject to such option by the copyright holder. --- (note the use of "Sun Microsystems" instead of Oracle, and the missing "Oracle and Java are registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners." section) So, I wonder - are files with these headers (and these variantions) OK to relicense? (There will be some header that differ more, but I guess it might make sense to first cover the easier cases above, which, as far as I can tell, are the majority of the code.)
            label: code-design
          13. Well, Sun became part of Oracle and, though the Sun licenses should have been relicensed to Oracle, in some cases they weren't. Also, when we were preparing the donation, our approach was to make a 'best effort' in terms of relicensing from Sun to Oracle and from other licenses to Oracle, since the intention of the donation was for everything in the ZIP file that was to form the donation to Apache to be donated to Apache and hence the intention was for everything in the ZIP file to ultimately be relicensed to Apache. I can only speak from the point of view of the intention of the 1st code donation, i.e., the ZIP file that has been donated to Apache -- the intention is for everything in that ZIP file to be donated and hence relicensed to Apache.
          14. @Gj I agree. Any file that has the Oracle or Sun original license is part of the donation and should have its license header changed to the standard Apache header.
          15. Hi, Knowing the intent of both parties, there is extremely little legal risk to accept the grant. Please accept the grant, that's my recommendation as VP, Legal of the ASF. Sincerely, Chris Mattmann VP, Legal, ASF
          16. That is great -- and does it mean that we can simply go ahead and relicense everything to Apache? Or do we need to spend time and resources on re-estebalishing the provenance of each and every individual file first?
          17. Accepting a grant doesn't mean relicensing everything to Apache. It means importing the code as-is, without restriction. As to establishing the provenance of code, that is the responsibility of the PMC on any code import (e.g., this was done when I was a PMC member helping to bring Apache OODT in from NASA; with Apache Climate from NASA, etc. etc.) In short, the PMC is responsible for establishing the provenance of the code it manages. So I am basically saying, as VP, Legal, I recommend you accept the code grant/donation. Then, during Incubation, as the PMC, sort through the files, figure out what's what, and proceed without restriction. Thanks, Chris
          18. In sorting through the files and doing the relicensing, since it's going to be a very large set of changes, we'd like to do one big merge from a fork. I.e., we propose doing a fork of incubator-netbeans to, for example, github.com/geertjanwielenga, and then doing all the license changes there, after which we'd do one big merge into incubator-netbeans.
          19. > ...we propose doing a fork of incubator-netbeans to, for example, github.com/geertjanwielenga, .. Can't you do that in a branch of the ASF repository instead? It's better IMO if things stay here.
          20. GitHub user matthiasblaesing opened a pull request: https://github.com/apache/incubator-netbeans/pull/5 [NETBEANS-54] Module Review db.core - no external libraries - checked Rat report; missing license headers added, unrecognized license headers manually changed, ignored manifest.mf and *.form (see central problems) - skimmed through the module, did not notice additional problems You can merge this pull request into a Git repository by running: $ git pull https://github.com/matthiasblaesing/incubator-netbeans db.core-review Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/5.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #5 ---- commit fa9676d569ac4ea1243cc86c62368fda862919cc Author: Matthias Bläsing <mblaesing@doppel-helix.eu> Date: 2017-09-24T19:37:02Z [NETBEANS-54] Module Review db.core - no external libraries - checked Rat report; missing license headers added, unrecognized license headers manually changed, ignored manifest.mf and *.form (see central problems) - skimmed through the module, did not notice additional problems ----
          21. GitHub user matthiasblaesing opened a pull request: https://github.com/apache/incubator-netbeans/pull/6 [NETBEANS-54] Module Review db - external library derby-10.2.2.0.jar: ALv2 licensed, notice added, Maven coordinates added. - checked Rat report; missing license headerd added, unrecognized license headers manually changed, ignored l10n.list, manifest.mf, org-netbeans-modules-db.sig and *.form (see central problems) - skimmed through the module, did not notice additional problems You can merge this pull request into a Git repository by running: $ git pull https://github.com/matthiasblaesing/incubator-netbeans db-review Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/6.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #6 ---- commit ac64007efbf2f6fd3383e1aa5c3c4fa066f0273b Author: Matthias Bläsing <mblaesing@doppel-helix.eu> Date: 2017-09-24T18:55:43Z [NETBEANS-54] Module Review db - external library derby-10.2.2.0.jar: ALv2 licensed, notice added, Maven coordinates added. - checked Rat report; missing license headerd added, unrecognized license headers manually changed, ignored l10n.list, manifest.mf, org-netbeans-modules-db.sig and *.form (see central problems) - skimmed through the module, did not notice additional problems ----
          22. GitHub user dschoorl opened a pull request: https://github.com/apache/incubator-netbeans/pull/7 [NETBEANS-54] Module Review api.annotations.common - external library: jsr305. pom file states AL-v2.0, however, jsr305-license.txt states 'New BSD license'. Assuming AL-v2.0, removing license file, no notice necessary. Maven coordinates added. - checked Rat report; changed/added license headers in 3 files: external/binaries-list and apichanges.xml + one file located under META-INF/services, but maybe the latter does not need a license header? - skimmed through the module, did not notice additional problems You can merge this pull request into a Git repository by running: $ git pull https://github.com/dschoorl/incubator-netbeans master Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/7.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #7 ---- commit dec2e813e4168f87277bd0a34addfad25bb09cc7 Author: Dave Schoorl <daveloper.rex@gmail.com> Date: 2017-09-24T22:30:50Z [NETBEANS-54] Module Review api.annotations.common - external library: jsr305. pom file states AL-v2.0, however, jsr305-license.txt states 'New BSD license'. Assuming AL-v2.0, removing license file, no notice necessary. Maven coordinates added. - checked Rat report; changed/added license headers in 3 files: external/binaries-list and apichanges.xml + one file located under META-INF/services, but maybe the latter does not need a license header? - skimmed through the module, did not notice additional problems ----
          23. Github user jlahoda commented on the issue: https://github.com/apache/incubator-netbeans/pull/7 I am afraid the license here is a little bit more complex. I think the license is probably BSD, at least based on FindBugs: https://github.com/findbugsproject/findbugs/blob/master/findbugs/licenses/LICENSE-jsr305.txt (Its not clear where the Apache license note comes from, but it is probably not correct.) Also, the file contains some re-packaged annotations from net.jcip.annotations, so these are presumably under: https://github.com/findbugsproject/findbugs/blob/master/findbugs/licenses/LICENSE-jcip.txt So we probably need a license file with these both and maybe even a -notice.txt. The good thing on this particular place is that we only need this file for building. The license file should be present even if the license would be Apache. Otherwise, looks OK.
          24. Github user jlahoda commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/6#discussion_r140850531 --- Diff: db/external/derby-10.2.2.0-notice.txt --- @@ -0,0 +1,298 @@ +========================================================================= --- End diff -- Not quite clear to me how the notice should look like - I think this is OK for now, we will learn if there's an issue with it.
          25. Github user jlahoda commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/6#discussion_r140850184 --- Diff: db/external/binaries-list --- @@ -1,2 +1,18 @@ -F787C9B484CD7526F866C21D8925C4DACE467F8A derby-10.2.2.0.jar -97771BE04E7452FC197EB875D2591A7E91F274D0 derby-10.2.2.0.zip --- End diff -- The zip is unused, right? (I did a quick search, and didn't find a place where it would be used.)
          26. Github user jlahoda commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/6#discussion_r140850999 --- Diff: db/test/unit/src/org/netbeans/modules/db/explorer/DbDriverManagerTest.java --- @@ -221,7 +221,7 @@ private static JDBCDriver createJDBCDriver() { private static JDBCDriver createDummyJDBCDriver(File dataDir) throws MalformedURLException { URL url = dataDir.toURL(); - return JDBCDriver.create("test_driver", "DbDriverManagerTest DummyDriver", "DummyDriver", new URL[] { url }); + return JDBCDriver.create("test_driver", "DbDriverManagerTest DummyDriver", "org.netbeans.modules.db.explorer.DbDriverManagerTest$DriverImpl", new URL[] { url }); --- End diff -- So what is the significance of this change? (If it is unrelated to "license" review, then I'd suggest to send it separately, for clarity.)
          27. Github user matthiasblaesing commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/6#discussion_r140853623 --- Diff: db/external/binaries-list --- @@ -1,2 +1,18 @@ -F787C9B484CD7526F866C21D8925C4DACE467F8A derby-10.2.2.0.jar -97771BE04E7452FC197EB875D2591A7E91F274D0 derby-10.2.2.0.zip --- End diff -- I did not find any usage and as such I removed that reference.
          28. Github user matthiasblaesing commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/6#discussion_r140854981 --- Diff: db/test/unit/src/org/netbeans/modules/db/explorer/DbDriverManagerTest.java --- @@ -221,7 +221,7 @@ private static JDBCDriver createJDBCDriver() { private static JDBCDriver createDummyJDBCDriver(File dataDir) throws MalformedURLException { URL url = dataDir.toURL(); - return JDBCDriver.create("test_driver", "DbDriverManagerTest DummyDriver", "DummyDriver", new URL[] { url }); + return JDBCDriver.create("test_driver", "DbDriverManagerTest DummyDriver", "org.netbeans.modules.db.explorer.DbDriverManagerTest$DriverImpl", new URL[] { url }); --- End diff -- It is related, as I run unittests and they failed. This was necessary to let them cleanly again. This is related to the change in the binaries-list, as the binaries are used by the unittests.
          29. GitHub user jlahoda opened a pull request: https://github.com/apache/incubator-netbeans/pull/8 [NETBEANS-54] Module Review api.htmlui -no external library -checked Rat report: no license of manifest and signature file (see central problems); unconverted license in api.htmlui/src/org/netbeans/api/htmlui/HTMLDialog.java (misplaced /*\n, so the tool, being strict, refused to convert it. After deleting the '/*\n', the tool was happy to convert the header). -skimmed through the module, did not notice additional problems You can merge this pull request into a Git repository by running: $ git pull https://github.com/jlahoda/incubator-netbeans api.htmlui-review2 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/8.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #8 ---- commit 5becc129a2753d62ca6b787cb34f85b380d260c7 Author: Jan Lahoda <jlahoda@netbeans.org> Date: 2017-09-24T06:20:19Z [NETBEANS-54] Module Review api.htmlui -no external library -checked Rat report: no license of manifest and signature file (see central problems); unconverted license in api.htmlui/src/org/netbeans/api/htmlui/HTMLDialog.java (misplaced /*\n, so the tool, being strict, refused to convert it. After deleting the '/*\n', the tool was happy to convert the header). -skimmed through the module, did not notice additional problems ----
          30. Github user asfgit commented on the issue: https://github.com/apache/incubator-netbeans/pull/8 Can one of the admins verify this patch?
          31. Github user asfgit commented on the issue: https://github.com/apache/incubator-netbeans/pull/7 Can one of the admins verify this patch?
          32. Github user asfgit commented on the issue: https://github.com/apache/incubator-netbeans/pull/6 Can one of the admins verify this patch?
          33. Github user asfgit commented on the issue: https://github.com/apache/incubator-netbeans/pull/5 Can one of the admins verify this patch?
          34. Github user emilianbold commented on the issue: https://github.com/apache/incubator-netbeans/pull/8 @asfgit who are you?
          35. GitHub user emilianbold opened a pull request: https://github.com/apache/incubator-netbeans/pull/9 [NETBEANS-54] Module Review openide.util.* This branch covers: * openide.util : no changes * openide.util.enumerations : no changes * openide.util.lookup : see patches / wiki * openide.util.ui: see patches / wiki You can merge this pull request into a Git repository by running: $ git pull https://github.com/emilianbold/incubator-netbeans emi-review-openide-util Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/9.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #9 ---- commit 603618ed73216e5b1ca84744372f15821f2f1520 Author: Emilian Bold <emi@apache.org> Date: 2017-09-26T08:04:07Z [NETBEANS-54] Module Review openide.util.ui Adds some license headers to test resources. Minor change in UtilitiesTranslateTest to support comment lines (ie. the license header) for a given test resource. commit 557faa75fe80bfc57e6b19ea02696ec8bf601a66 Author: Emilian Bold <emi@apache.org> Date: 2017-09-26T08:05:24Z [NETBEANS-54] Module Review openide.util.lookup ----
          36. GitHub user emilianbold opened a pull request: https://github.com/apache/incubator-netbeans/pull/10 [NETBEANS-54] Module Review openide.filesystems.* * openide.filesystems * openide.filesystems.nb * openide.filesystems.compat8 (no change) You can merge this pull request into a Git repository by running: $ git pull https://github.com/emilianbold/incubator-netbeans emi-review-openide-filesystems Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/10.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #10 ---- commit 9fce19e5c1313c90e20fbb7e971e474f98422463 Author: Emilian Bold <emi@apache.org> Date: 2017-09-26T08:45:27Z [NETBEANS-54] Module Review openide.filesystems commit 2553bf5e50d075d89eed3531587c4da8f782e9a1 Author: Emilian Bold <emi@apache.org> Date: 2017-09-26T08:48:42Z [NETBEANS-54] Module Review openide.filesystems.nb ----
          37. Github user JaroslavTulach commented on the issue: https://github.com/apache/incubator-netbeans/pull/10 Good changes. How do I merge them?
          38. Github user JaroslavTulach commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/9#discussion_r141020052 --- Diff: openide.util.ui/test/unit/src/org/openide/util/UtilitiesTranslateTest.java --- @@ -157,6 +157,11 @@ public void testTranslateOldFormat () throws Exception { if (line == null) { break; } + + if (line.startsWith("#")) { --- End diff -- I see. This is to support comments in test files.
          39. Github user JaroslavTulach commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/8#discussion_r141023560 --- Diff: api.htmlui/src/org/netbeans/api/htmlui/HTMLDialog.java --- @@ -1,44 +1,20 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * Copyright 2014 Oracle and/or its affiliates. All rights reserved. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header/* - - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2014 Sun Microsystems, Inc. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ --- End diff -- Correct change. This is certainly file owned by Oracle as I (Oracle employee) wrote it.
          40. Github user JaroslavTulach commented on the issue: https://github.com/apache/incubator-netbeans/pull/8 This patch is correct and can be integrated.
          41. GitHub user emilianbold opened a pull request: https://github.com/apache/incubator-netbeans/pull/13 [NETBEANS-54] Module Review openide.modules You can merge this pull request into a Git repository by running: $ git pull https://github.com/emilianbold/incubator-netbeans emi-review-openide-modules Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/13.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #13 ---- commit 2f8b133afae4b978a1f21677f8cce9ac3909c711 Author: Emilian Bold <emi@apache.org> Date: 2017-09-26T11:53:42Z [NETBEANS-54] Module Review openide.modules ----
          42. GitHub user emilianbold opened a pull request: https://github.com/apache/incubator-netbeans/pull/14 [NETBEANS-54] Module Review o.n.swing.tabcontrol Updated license, but according to http://www.apache.org/legal/src-headers.html#faq-exceptions no license would also be OK. You can merge this pull request into a Git repository by running: $ git pull https://github.com/emilianbold/incubator-netbeans emi-review-o.n.swing.tabcontrol Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/14.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #14 ---- commit c5894721394ee0d8e1c7cb21286518b43563351d Author: Emilian Bold <emi@apache.org> Date: 2017-09-26T13:14:19Z [NETBEANS-54] Module Review o.n.swing.tabcontrol ----
          43. GitHub user ebarboni opened a pull request: https://github.com/apache/incubator-netbeans/pull/15 [NETBEANS-54] Module Review uihandler package.html was not updated by the tools You can merge this pull request into a Git repository by running: $ git pull https://github.com/ebarboni/incubator-netbeans uihandlerreview Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/15.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #15 ---- commit efd73df90eb876b95e2ca2aa866a7ed6e7bfb1ba Author: <barboni@balkiel.irit.fr> Date: 2017-09-26T09:43:24Z properties for by module report commit 7b43ea230fa170cba886356c8fca0488d22dd85a Author: <barboni@balkiel.irit.fr> Date: 2017-09-26T13:10:08Z change header for apache bad dectection of the tool commit 863393c50a2fcc246313626232f07cdf4897703f Author: <barboni@balkiel.irit.fr> Date: 2017-09-26T13:30:57Z Revert "properties for by module report" This reverts commit efd73df90eb876b95e2ca2aa866a7ed6e7bfb1ba. ----
          44. Github user jlahoda commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/6#discussion_r141121602 --- Diff: db/test/unit/src/org/netbeans/modules/db/explorer/DbDriverManagerTest.java --- @@ -221,7 +221,7 @@ private static JDBCDriver createJDBCDriver() { private static JDBCDriver createDummyJDBCDriver(File dataDir) throws MalformedURLException { URL url = dataDir.toURL(); - return JDBCDriver.create("test_driver", "DbDriverManagerTest DummyDriver", "DummyDriver", new URL[] { url }); + return JDBCDriver.create("test_driver", "DbDriverManagerTest DummyDriver", "org.netbeans.modules.db.explorer.DbDriverManagerTest$DriverImpl", new URL[] { url }); --- End diff -- So, the test was passing before other changes in the pull request and started to fail after the changes have been made?
          45. Github user matthiasblaesing commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/6#discussion_r141124129 --- Diff: db/test/unit/src/org/netbeans/modules/db/explorer/DbDriverManagerTest.java --- @@ -221,7 +221,7 @@ private static JDBCDriver createJDBCDriver() { private static JDBCDriver createDummyJDBCDriver(File dataDir) throws MalformedURLException { URL url = dataDir.toURL(); - return JDBCDriver.create("test_driver", "DbDriverManagerTest DummyDriver", "DummyDriver", new URL[] { url }); + return JDBCDriver.create("test_driver", "DbDriverManagerTest DummyDriver", "org.netbeans.modules.db.explorer.DbDriverManagerTest$DriverImpl", new URL[] { url }); --- End diff -- No - master fails this test also.
          46. GitHub user matthiasblaesing opened a pull request: https://github.com/apache/incubator-netbeans/pull/16 [NETBEANS-54] Module Review db.dataview - no external libraries - fix Rat files: - add missing ALv2 headers for .sql files - move dbdata.txt to dbdata.properties and add header - fix missing header adjustments (all file copyright Sun/Oracle) You can merge this pull request into a Git repository by running: $ git pull https://github.com/matthiasblaesing/incubator-netbeans db.dataview-review Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/16.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #16 ---- commit 3c33090c4d42a2f1ffa959594b6905c6b60b87da Author: Matthias Bläsing <mblaesing@doppel-helix.eu> Date: 2017-09-25T15:56:19Z [NETBEANS-54] Module Review db.dataview - no external libraries - fix Rat files: - add missing ALv2 headers for .sql files - move dbdata.txt to dbdata.properties and add header - fix missing header adjustments (all file copyright Sun/Oracle) ----
          47. Github user jlahoda commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/6#discussion_r141172728 --- Diff: db/test/unit/src/org/netbeans/modules/db/explorer/DbDriverManagerTest.java --- @@ -221,7 +221,7 @@ private static JDBCDriver createJDBCDriver() { private static JDBCDriver createDummyJDBCDriver(File dataDir) throws MalformedURLException { URL url = dataDir.toURL(); - return JDBCDriver.create("test_driver", "DbDriverManagerTest DummyDriver", "DummyDriver", new URL[] { url }); + return JDBCDriver.create("test_driver", "DbDriverManagerTest DummyDriver", "org.netbeans.modules.db.explorer.DbDriverManagerTest$DriverImpl", new URL[] { url }); --- End diff -- If I were doing this, I'd probably do two commits - one license-related cleanup, and one test fix/cleanup. OTOH, I don't think this is important enough to block the change on it, so I'll leave the decision on you on this matter.
          48. Github user svenreimers commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/6#discussion_r141175203 --- Diff: db/test/unit/src/org/netbeans/modules/db/explorer/DbDriverManagerTest.java --- @@ -221,7 +221,7 @@ private static JDBCDriver createJDBCDriver() { private static JDBCDriver createDummyJDBCDriver(File dataDir) throws MalformedURLException { URL url = dataDir.toURL(); - return JDBCDriver.create("test_driver", "DbDriverManagerTest DummyDriver", "DummyDriver", new URL[] { url }); + return JDBCDriver.create("test_driver", "DbDriverManagerTest DummyDriver", "org.netbeans.modules.db.explorer.DbDriverManagerTest$DriverImpl", new URL[] { url }); --- End diff -- Same here. I would prefer a split - first ee fix sll the thing eith regards to licensing etc. stuff and afterwards we start fixing failing tests (I assume we will find more)
          49. Github user dschoorl commented on the issue: https://github.com/apache/incubator-netbeans/pull/7 Thanks Jan. I restored the jsr305 license and added a jcip license. I updated license header files according to latest insights on Rat exclusions (files that don need a license header). I think a NOTICE should be at the project's top level, so this is outside the scope of this module review. Is this alright now?
          50. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/6 @svenreimers @jlahoda I reverted the fix for the unittest to get this merged at some point, but I don't agree with your assessment.
          51. GitHub user emilianbold opened a pull request: https://github.com/apache/incubator-netbeans/pull/17 [NETBEANS-54] Module Review openide.text You can merge this pull request into a Git repository by running: $ git pull https://github.com/emilianbold/incubator-netbeans emi-review-openide.text Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/17.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #17 ---- commit 67c571bcca67f425fecc6814bfbc8d94264ebb0b Author: Emilian Bold <emi@apache.org> Date: 2017-09-27T08:44:36Z [NETBEANS-54] Module Review openide.text ----
          52. GitHub user emilianbold opened a pull request: https://github.com/apache/incubator-netbeans/pull/18 [NETBEANS-54] Module Review settings You can merge this pull request into a Git repository by running: $ git pull https://github.com/emilianbold/incubator-netbeans emi-review-settings Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/18.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #18 ---- commit ff62698079f4e628618550dc33e84e51b09f4727 Author: Emilian Bold <emi@apache.org> Date: 2017-09-27T09:13:15Z [NETBEANS-54] Module Review settings ----
          53. GitHub user emilianbold opened a pull request: https://github.com/apache/incubator-netbeans/pull/19 [NETBEANS-54] Module Review openide.nodes You can merge this pull request into a Git repository by running: $ git pull https://github.com/emilianbold/incubator-netbeans emi-review-openide.nodes Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/19.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #19 ---- ----
          54. GitHub user matthiasblaesing opened a pull request: https://github.com/apache/incubator-netbeans/pull/20 [NETBEANS-54] Module Review db.drivers - updated binaries-list to maven coordinates and ensured consitent naming after build - checked Rat report: everything has been relicensed to Apache, included in 'central problems' list above, or excluded via Rat - skimmed through module, did not notice additional problems You can merge this pull request into a Git repository by running: $ git pull https://github.com/matthiasblaesing/incubator-netbeans db.drivers-review Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/20.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #20 ---- commit 5757dd81645aa338084c48b8cb7f4e3147606e57 Author: Matthias Bläsing <mblaesing@doppel-helix.eu> Date: 2017-09-27T17:27:36Z [NETBEANS-54] Module Review db.drivers - updated binaries-list to maven coordinates and ensured consitent naming after build - checked Rat report: everything has been relicensed to Apache, included in 'central problems' list above, or excluded via Rat - skimmed through module, did not notice additional problems ----
          55. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/8 +1
          56. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/9 +1
          57. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/10 +1
          58. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/13 +1
          59. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/14 +1
          60. Github user jlahoda commented on the issue: https://github.com/apache/incubator-netbeans/pull/6 Matthias, you are an Apache Netbeans committer, right? So you should be able to push this directly to the apache repository (https://git-wip-us.apache.org/repos/asf/incubator-netbeans). (I would suggest to rebase the changes before merging so that there's no actual merge commit, but up to you, I am not a git expert.) Please let me know if you need any help. Thanks for working on this!
          61. Github user jlahoda commented on the issue: https://github.com/apache/incubator-netbeans/pull/17 Looks OK to me.
          62. Github user jlahoda commented on the issue: https://github.com/apache/incubator-netbeans/pull/19 Looks OK to me.
          63. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/6 @svenreimers @jlahoda thanks for taking time for review! I merged the change into master. I'm manually closing this here, as the merge was done as a fast-forward merge and so no merge commit was created.
          64. Github user matthiasblaesing closed the pull request at: https://github.com/apache/incubator-netbeans/pull/6
          65. Github user emilianbold commented on the issue: https://github.com/apache/incubator-netbeans/pull/9 I merged the PR changes into master.
          66. Github user emilianbold closed the pull request at: https://github.com/apache/incubator-netbeans/pull/9
          67. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/15 The change looks good. If you squash these three commits together, the two commits efd73df and 863393c will cancel each other out and so only the "real" change remains. This keeps the history clean.
          68. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/17 I agree this looks good.
          69. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/18 Looks good.
          70. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/19 The change looks ok, I'd like to know how this META-INF file is used though.
          71. Github user emilianbold commented on the issue: https://github.com/apache/incubator-netbeans/pull/19 Looks like a Jackpot hints file. Not sure when it's loaded for tests only though...
          72. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/19 Ok - I also did not find out the "why", but indeed the path is read from `org.netbeans.modules.java.hints.declarative.DeclarativeHintRegistry` in the `java.hints.declarative` module. The grammar suggests, that the block comment syntax is correct. Thanks for the hint.
          73. Github user jlahoda commented on the issue: https://github.com/apache/incubator-netbeans/pull/19 Sorry for now answering sooner. This is a test for "openide.nodes/src/META-INF/upgrade/org.openides.nodes.Node.hint". It is parsed by org.netbeans.modules.java.hints.declarative.test.TestParser.parse, and I believe the parser should ignore everything before the first %%TestCase. (In principle, the tests can be also run when the module tests are run, but I doubt that is configured for the nodes module. So the way to run the test is to open it in the IDE.)
          74. GitHub user matthiasblaesing opened a pull request: https://github.com/apache/incubator-netbeans/pull/22 [NETBEANS-54] Module Review db.mysql - no external library - checked Rat report; unrecognized license headers manually changed, ignored manifest.mf and *.form (see central problems) - skimmed through the module, did not notice additional problems You can merge this pull request into a Git repository by running: $ git pull https://github.com/matthiasblaesing/incubator-netbeans db.mysql-review Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/22.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #22 ---- commit 07f99570c87b11edfef828c4bff68376226e089d Author: Matthias Bläsing <mblaesing@doppel-helix.eu> Date: 2017-09-29T19:14:59Z [NETBEANS-54] Module Review db.mysql - no external library - checked Rat report; unrecognized license headers manually changed, ignored manifest.mf and *.form (see central problems) - skimmed through the module, did not notice additional problems ----
          75. GitHub user matthiasblaesing opened a pull request: https://github.com/apache/incubator-netbeans/pull/23 [NETBEANS-54] Module Review db.sql.editor - no external library - checked Rat report; unrecognized license headers manually changed, missing headers added, ignored *.form (see central problems) and SQLExample. The latter file is used in the GUI as a sample and in addition does not reach a level of creativity. - skimmed through the module, did not notice additional problems - Modified tests to allow comments in *.test and *.pass files You can merge this pull request into a Git repository by running: $ git pull https://github.com/matthiasblaesing/incubator-netbeans db.sql.editor-review Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/23.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #23 ---- commit ae8c59fe2679401cb1c533f52f7c838e848b1533 Author: Matthias Bläsing <mblaesing@doppel-helix.eu> Date: 2017-09-29T20:19:13Z [NETBEANS-54] Module Review db.sql.editor - no external library - checked Rat report; unrecognized license headers manually changed, missing headers added, ignored *.form (see central problems) and SQLExample. The latter file is used in the GUI as a sample and in addition does not reach a level of creativity. - skimmed through the module, did not notice additional problems - Modified tests to allow comments in *.test and *.pass files ----
          76. GitHub user matthiasblaesing opened a pull request: https://github.com/apache/incubator-netbeans/pull/24 [NETBEANS-54] Module Review db.sql.visualeditor - external library javacc is only used at build time and is not distributed with netbeans - modified binaries-list to point to maven coordinates - checked Rat report; missing headers added, ignored *.form (see central problems) - skimmed through the module, did not notice additional problems You can merge this pull request into a Git repository by running: $ git pull https://github.com/matthiasblaesing/incubator-netbeans db.sql.visualeditor-review Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/24.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #24 ---- commit 6e470a8ef57af875989dac5a02e125536c203f34 Author: Matthias Bläsing <mblaesing@doppel-helix.eu> Date: 2017-09-29T20:57:42Z [NETBEANS-54] Module Review db.sql.visualeditor - external library javacc is only used at build time and is not distributed with netbeans - modified binaries-list to point to maven coordinates - checked Rat report; missing headers added, ignored *.form (see central problems) - skimmed through the module, did not notice additional problems ----
          77. GitHub user junichi11 opened a pull request: https://github.com/apache/incubator-netbeans/pull/26 [NETBEANS-54] Module Review api.debugger - no external library - checked Rat report: update license header in two package.html - skimmed through the module, did not notice additional problems You can merge this pull request into a Git repository by running: $ git pull https://github.com/junichi11/incubator-netbeans module-review-api.debugger Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/26.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #26 ---- commit aecd23b33879f5750d9bd9d0300cda09b0cc88d1 Author: Junichi Yamamoto <junichi11@apache.org> Date: 2017-09-29T22:14:54Z [NETBEANS-54] Module Review api.debugger ----
          78. GitHub user junichi11 opened a pull request: https://github.com/apache/incubator-netbeans/pull/27 [NETBEANS-54] Module Review api.xml.ui - no external library - checked Rat report: add the license header to test/unit/src/org/netbeans/spi/xml/cookies/data/*, ignore org-netbeans-api-xml-ui.sig - skimmed through the module, did not notice additional problems You can merge this pull request into a Git repository by running: $ git pull https://github.com/junichi11/incubator-netbeans module-review-api.xml.ui Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/27.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #27 ---- commit 4f82952d953ab686328d9f8f5336ee10635f82b2 Author: Junichi Yamamoto <junichi11@apache.org> Date: 2017-09-30T02:24:09Z [NETBEANS-54] Module Review api.xml.ui ----
          79. GitHub user junichi11 opened a pull request: https://github.com/apache/incubator-netbeans/pull/28 [NETBEANS-54] Module Review bugtracking - no external library - checked Rat report: update license header in apichanges.xml, TestIssue.java, and TestQuery. ignore *.form and org-netbeans-modules-bugtracking.sig - skimmed through the module, did not notice additional problems You can merge this pull request into a Git repository by running: $ git pull https://github.com/junichi11/incubator-netbeans module-review-bugtracking Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/28.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #28 ---- commit d87524754456e1e3edb1d82fa36b3454832ebe4c Author: Junichi Yamamoto <junichi11@apache.org> Date: 2017-09-30T04:34:22Z [NETBEANS-54] Module Review bugtracking ----
          80. Github user emilianbold commented on the issue: https://github.com/apache/incubator-netbeans/pull/27 Some extra newlines at the end but looks ok.
          81. Github user emilianbold commented on the issue: https://github.com/apache/incubator-netbeans/pull/24 binaries-list is a "problem to be solved centrally". I would not add license headers to it.
          82. Github user emilianbold commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/23#discussion_r141999350 --- Diff: db.sql.editor/test/unit/src/org/netbeans/modules/db/sql/editor/completion/SelectCompletionQueryTest.java --- @@ -143,27 +143,19 @@ public void testCompletion() throws Exception { } } } - } finally { - reader.close(); } String sql = sqlData.toString(); Metadata metadata = TestMetadata.create(modelData); if (stdout) { performTest(sql, metadata, System.out); } else { File result = new File(getWorkDir(), getName() + ".result"); - Writer writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(result), "utf-8")); - try { + try (Writer writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(result), "utf-8"))) { performTest(sql, metadata, writer); - } finally { - writer.close(); } File pass = new File(getWorkDir(), getName() + ".pass"); - InputStream input = SelectCompletionQueryTest.class.getResource(getName() + ".pass").openStream(); - try { - copyStream(input, pass); - } finally { - input.close(); + try (InputStream input = SelectCompletionQueryTest.class.getResource(getName() + ".pass").openStream()) { --- End diff -- Changing this was not necessary. But if we do it, why not `getResourceAsStream`?
          83. Github user emilianbold commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/23#discussion_r141999337 --- Diff: db.sql.editor/test/unit/src/org/netbeans/modules/db/sql/editor/completion/SelectCompletionQueryTest.java --- @@ -125,11 +125,11 @@ public void runTest() throws Exception { public void testCompletion() throws Exception { StringBuilder sqlData = new StringBuilder(); - List<String> modelData = new ArrayList<String>(); - BufferedReader reader = new BufferedReader(new InputStreamReader(SelectCompletionQueryTest.class.getResource(getName() + ".test").openStream(), "utf-8")); - try { + List<String> modelData = new ArrayList<>(); + try (InputStream is = SelectCompletionQueryTest.class.getResourceAsStream(getName() + ".test"); + BufferedReader reader = new BufferedReader(new InputStreamReader(is, "utf-8"))) { boolean separatorRead = false; - for (String line; (line = reader.readLine()) != null;) { + for (String line = reader.readLine(); line != null; line = reader.readLine()) { --- End diff -- Wasn't the previous `for` line better?
          84. Github user emilianbold commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/16#discussion_r141999524 --- Diff: db.dataview/test/unit/src/org/netbeans/modules/db/dataview/util/TestCaseDataFactory.java --- @@ -39,11 +39,11 @@ public static String DB_SQLINSERT="dbinsert.sql"; public static String DB_SQLSELECT="dbselect.sql"; public static String DB_SQLUPDATE="dbupdate.sql"; - public static String DB_TEXT= "dbdata.txt"; + public static String DB_DATA= "dbdata.properties"; --- End diff -- I don't understand why this was necessary. Just so we can add comments?
          85. Github user emilianbold commented on the issue: https://github.com/apache/incubator-netbeans/pull/15 +1
          86. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/24 I had to touch binaries-list to change it to maven coordinates - so adding the license header was a natural reaction. From my POV there is no gain by removing that header again - do you agree?
          87. Github user matthiasblaesing commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/23#discussion_r142002449 --- Diff: db.sql.editor/test/unit/src/org/netbeans/modules/db/sql/editor/completion/SelectCompletionQueryTest.java --- @@ -125,11 +125,11 @@ public void runTest() throws Exception { public void testCompletion() throws Exception { StringBuilder sqlData = new StringBuilder(); - List<String> modelData = new ArrayList<String>(); - BufferedReader reader = new BufferedReader(new InputStreamReader(SelectCompletionQueryTest.class.getResource(getName() + ".test").openStream(), "utf-8")); - try { + List<String> modelData = new ArrayList<>(); + try (InputStream is = SelectCompletionQueryTest.class.getResourceAsStream(getName() + ".test"); + BufferedReader reader = new BufferedReader(new InputStreamReader(is, "utf-8"))) { boolean separatorRead = false; - for (String line; (line = reader.readLine()) != null;) { + for (String line = reader.readLine(); line != null; line = reader.readLine()) { --- End diff -- I consider the previous one less readable. The previous version mixed initialization, loop advance and checking and these parts are now separated into their corresponding sections.
          88. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/23 Thanks for looking into this. I let the changed for loop in place and updated the usage of `getResource().openStream()` to `getResourceAsStream`.
          89. Github user matthiasblaesing commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/16#discussion_r142002680 --- Diff: db.dataview/test/unit/src/org/netbeans/modules/db/dataview/util/TestCaseDataFactory.java --- @@ -39,11 +39,11 @@ public static String DB_SQLINSERT="dbinsert.sql"; public static String DB_SQLSELECT="dbselect.sql"; public static String DB_SQLUPDATE="dbupdate.sql"; - public static String DB_TEXT= "dbdata.txt"; + public static String DB_DATA= "dbdata.properties"; --- End diff -- It was necessary to make it clear, that dbdata is not a plain text file, but a properties file. Else the next reader wonders why the comment header work correctly or where it gets stipped out. For a properties file this is correct by definition.
          90. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/15 @ebarboni There are two thinks I'd like to ask you: - Adjust your git settings to include a name and update the existing commits (see here: https://www.git-tower.com/learn/git/faq/change-author-name-email) - Rewrite the history to squash the two commit on CLI (for GUI support you need to look into the corresponding GUI): Checkout the branch that backs this PR, run `git rebase -i HEAD~3`, now an editor of your choosing is started, holding one row per commit (and some help info), there you can reorder the commits, remove commits and squash them. (I failed to do that on a checkout from your repository, as git cli requires identity information, that your commits are missing, see above)
          91. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/27 Looks good.
          92. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/26 Looks good. (there are now two positive reviews on this, as @emilianbold reacted with a thumbs up, which is not converted into a information message)
          93. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/28 Looks good. (there are now two positive reviews on this, as @emilianbold reacted with a thumbs up, which is not converted into a information message)
          94. Github user emilianbold commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/23#discussion_r142003704 --- Diff: db.sql.editor/test/unit/src/org/netbeans/modules/db/sql/editor/completion/SelectCompletionQueryTest.java --- @@ -125,11 +125,11 @@ public void runTest() throws Exception { public void testCompletion() throws Exception { StringBuilder sqlData = new StringBuilder(); - List<String> modelData = new ArrayList<String>(); - BufferedReader reader = new BufferedReader(new InputStreamReader(SelectCompletionQueryTest.class.getResource(getName() + ".test").openStream(), "utf-8")); - try { + List<String> modelData = new ArrayList<>(); + try (InputStream is = SelectCompletionQueryTest.class.getResourceAsStream(getName() + ".test"); + BufferedReader reader = new BufferedReader(new InputStreamReader(is, "utf-8"))) { boolean separatorRead = false; - for (String line; (line = reader.readLine()) != null;) { + for (String line = reader.readLine(); line != null; line = reader.readLine()) { --- End diff -- I believe the canonical trick is to have ```java String line; while((line = reader.readLine()) != null) { ... } ``` And the original `for` just mixed those to limit the scope of the `line` variable to the `for` block... which is nice. Your `for` repeats the `reader.readLine()` call which seems confusing.
          95. Github user emilianbold commented on the issue: https://github.com/apache/incubator-netbeans/pull/24 ... unless the central decision will be not to use headers and then your file becomes the only one that has to be manually tweaked back.
          96. Github user matthiasblaesing commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/23#discussion_r142003802 --- Diff: db.sql.editor/test/unit/src/org/netbeans/modules/db/sql/editor/completion/SelectCompletionQueryTest.java --- @@ -125,11 +125,11 @@ public void runTest() throws Exception { public void testCompletion() throws Exception { StringBuilder sqlData = new StringBuilder(); - List<String> modelData = new ArrayList<String>(); - BufferedReader reader = new BufferedReader(new InputStreamReader(SelectCompletionQueryTest.class.getResource(getName() + ".test").openStream(), "utf-8")); - try { + List<String> modelData = new ArrayList<>(); + try (InputStream is = SelectCompletionQueryTest.class.getResourceAsStream(getName() + ".test"); + BufferedReader reader = new BufferedReader(new InputStreamReader(is, "utf-8"))) { boolean separatorRead = false; - for (String line; (line = reader.readLine()) != null;) { + for (String line = reader.readLine(); line != null; line = reader.readLine()) { --- End diff -- I'll revert my change to this loop and then push to master.
          97. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/24 When that central decision is made, there is already at least one file that has this change already `db/external/binaries-list`. In any case the header is not wrong. The file is part of an apache project and was thus donated by oracle and is now covered by the apache license. If there is a consensus, that the license header is not needed, than it can still be left in place or at that time centrally removed. Till then I consider each file I don't have to discuss about a good file.
          98. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/23
          99. Github user ebarboni commented on the issue: https://github.com/apache/incubator-netbeans/pull/15 @matthiasblaesing thanks a lot for pointer on rebase. Hope its better now.
          100. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/15 @ebarboni thank you, that looks much cleaner. I have one last point: The commit message should reference the tracking bug. You had that in the PR, but that message does not get merged into the history, so I suggest, that you update the commit message to something like: > [NETBEANS-54] Module Review uihandler > > package.html was not updated by the tools You can do this by switching back to the branch backing the PR, and running `git commit --amend`. You can then change the commit message. This changes the commit itself and then you can do another force push.
          101. Github user ebarboni commented on the issue: https://github.com/apache/incubator-netbeans/pull/15 Done
          102. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/15
          103. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/15 Merged - thank you!
          104. GitHub user matthiasblaesing opened a pull request: https://github.com/apache/incubator-netbeans/pull/29 [NETBEANS-54] Module Review derby - external binary is binary form of etc/sample.sql (not on maven) - checked Rat report; missing header added to etc/sample.sql, ignored binaries-list and *.form files (see central problems) - skimmed through the module, did not notice additional problems - replacing the bundled binary is tracked by [NETBEANS-74] You can merge this pull request into a Git repository by running: $ git pull https://github.com/matthiasblaesing/incubator-netbeans derby-review Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/29.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #29 ---- commit 3d3a135eceb1fc820d08996890fe743c9a037fa8 Author: Matthias Bläsing <mblaesing@doppel-helix.eu> Date: 2017-09-30T20:21:57Z [NETBEANS-54] Module Review derby - external binary is binary form of etc/sample.sql (not on maven) - checked Rat report; missing header added to etc/sample.sql, ignored binaries-list and *.form files (see central problems) - skimmed through the module, did not notice additional problems - replacing the bundled binary is tracked by [NETBEANS-74] ----
          105. GitHub user matthiasblaesing opened a pull request: https://github.com/apache/incubator-netbeans/pull/30 [NETBEANS-54] Module Review defaults - no external library - checked Rat report; unrecognized license headers manually changed - skimmed through the module, did not notice additional problems You can merge this pull request into a Git repository by running: $ git pull https://github.com/matthiasblaesing/incubator-netbeans defaults-review Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/30.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #30 ---- commit e8a87d3195cfe0af8481f018aa7db9220ec61e80 Author: Matthias Bläsing <mblaesing@doppel-helix.eu> Date: 2017-09-30T20:43:27Z [NETBEANS-54] Module Review defaults - no external library - checked Rat report; unrecognized license headers manually changed - skimmed through the module, did not notice additional problems ----
          106. Github user emilianbold commented on the issue: https://github.com/apache/incubator-netbeans/pull/19 Committed.
          107. Github user emilianbold closed the pull request at: https://github.com/apache/incubator-netbeans/pull/19
          108. Github user jlahoda commented on the issue: https://github.com/apache/incubator-netbeans/pull/8 Pushed: https://git-wip-us.apache.org/repos/asf?p=incubator-netbeans.git;a=commit;h=3880c5162f149eb0d3953aacac63c4c014cd101d
          109. Github user jlahoda closed the pull request at: https://github.com/apache/incubator-netbeans/pull/8
          110. GitHub user juneau001 opened a pull request: https://github.com/apache/incubator-netbeans/pull/31 [NETBEANS-54] Module Review j2ee.core.utilities Updated j2ee.core.utilities license headers, where needed. - no external libraries - checked Rat report and adjusted license headers accordingly on identified problem files - skimmed module and did not see any other issues You can merge this pull request into a Git repository by running: $ git pull https://github.com/juneau001/incubator-netbeans master Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/31.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #31 ---- commit f70a4a8de60bebfb6c563de40faa096745cf5fab Author: Josh Juneau <juneau001@gmail.com> Date: 2017-10-01T13:45:12Z [NETBEANS-54] Module Review j2ee.core.utilities ----
          111. GitHub user borxa opened a pull request: https://github.com/apache/incubator-netbeans/pull/32 [NETBEANS-54] Module Review server - no external library - checked Rat report; changed license headers in 2 files - skimmed through the module, did not notice additional problems You can merge this pull request into a Git repository by running: $ git pull https://github.com/borxa/incubator-netbeans master Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/32.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #32 ---- commit 664936aa2c6d60406818ef016052d36681efed00 Author: borxa <borxa@192.168.1.201> Date: 2017-10-01T16:54:40Z [NETBEANS-54] Module Review server ----
          112. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/31 Please have another look at this: - Please ignore the files covered in th "Problems to be solved centrally" of https://cwiki.apache.org/confluence/display/NETBEANS/List+of+Modules+to+Review. For example the .form files were updated centrally from their corresponding .java files. These changes need to removed from this changeset. I suggest you also remove changes that relate to file in the mentioned section. - the latter change might also fix the changes line endings in build.xml
          113. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/32 The changes itself look good. Could you please just adjust your git setttings to contain your name and email address as author (see here: https://www.git-tower.com/learn/git/faq/change-author-name-email).
          114. Github user juneau001 commented on the issue: https://github.com/apache/incubator-netbeans/pull/31 Thanks for the feedback and sorry for missing those "Problems to be solved centrally".
          115. Github user jlahoda commented on the issue: https://github.com/apache/incubator-netbeans/pull/7 Hi Dave, Sorry for belated answer. I think the jcip license text should be merged into the existing -license.txt file. Also the "License: " tag should probably be changed to something else than "New BSD" (e.g. "BSD+jcip"). Even if though this is probably not ever going to be used. For notice - I suspect we will need different notices, one at the top level of the repository for things that are in the repository (which this is not), and a different one for binary builds (where the notice should contain exactly what is in the binary, not more, not less, in other words, this will probably differ between the platform and the Java IDE). And there needs to be enough data to construct such notices automatically, I don't think it is realistic to maintain them manually. Hence the request to add -notice.txt to external binaries if needed, so the build will be able to pick them up if needed. But it is not quite clear to me if anything like that is needed for this library.
          116. Github user borxa commented on the issue: https://github.com/apache/incubator-netbeans/pull/32 Settings updated
          117. Github user dschoorl commented on the issue: https://github.com/apache/incubator-netbeans/pull/7 Hi Jan, Thanks for reviewing again. In no way, I am a legal expert. But I think that by providing the jcip-license.txt file, we meet the requirements of the license stated in article 4b (https://creativecommons.org/licenses/by/2.5/legalcode) and I think no notice is needed? Why do you think needs the jcip license text be merged in the jsr305 one? I believe this is also not done by the findbugs-community who repackaged it with jsr305.jar. Are these -license.txt files somehow processed automatically and do they need a certain structure, such as having a License-tag? Is that described somewhere?
          118. GitHub user junichi11 opened a pull request: https://github.com/apache/incubator-netbeans/pull/36 [NETBEANS-54] Module Review api.xml - no external library - checked Rat report: add the license header in two *.dtd. ignore three package-list[1] files, org-netbeans-api-xml.sig - A unit test fails even if the license header is not added. (ClassNotFoundException: org.apache.crimson.parser.XMLReaderImpl) [1] http://docs.oracle.com/javase/8/docs/technotes/tools/windows/javadoc.html#JSWOR663 You can merge this pull request into a Git repository by running: $ git pull https://github.com/junichi11/incubator-netbeans module-review-api.xml Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/36.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #36 ---- commit d94a8cbde4c1cde564e4635751d1799c76a70718 Author: Junichi Yamamoto <junichi11@apache.org> Date: 2017-10-01T22:22:01Z [NETBEANS-54] Module Review api.xml - no external library - checked Rat report: add the license header in two *.dtd. ignore three package-list files, org-netbeans-api-xml.sig - A unit test fails even if the license header is not added. ----
          119. Github user junichi11 commented on the issue: https://github.com/apache/incubator-netbeans/pull/31 #21 was merged. So, it seems that this PR includes the commit for removing the license header for .form files.
          120. Github user jlahoda commented on the issue: https://github.com/apache/incubator-netbeans/pull/7 Description of the current -license.txt processing is here: http://wiki.netbeans.org/DevFaqExternalLibraries I think details under Apache are still somewhat unclear, but I think maintaining -license.txt and -notice.txt (if needed) in the library wrapper near the external library is much more maintainable than trying to have a central registry, and that whatever we do will be based on the current design/state. So, I think it would be good to have things prepared for automatic processing as much as possible. Thanks.
          121. GitHub user vieiro opened a pull request: https://github.com/apache/incubator-netbeans/pull/37 [NETBEANS-54] Module Review editor.lib - no external libraries - checked Rat report: modified license header in src/org/netbeans/editor/BaseKit.java - skimmed through the module, did not notice additional problems You can merge this pull request into a Git repository by running: $ git pull https://github.com/vieiro/incubator-netbeans netbeans-54-module-review-editor.lib Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/37.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #37 ---- commit 2993d25f8c12ebf6e2b8ec5bdbe4a1f32e447a0c Author: Antonio Vieiro <antonio@vieiro.net> Date: 2017-10-02T09:47:44Z [NETBEANS-54] Module Review editor.lib - no external libraries - checked Rat report: modified license header in src/org/netbeans/editor/BaseKit.java ----
          122. GitHub user vieiro opened a pull request: https://github.com/apache/incubator-netbeans/pull/38 [NETBEANS-54] Module Review editor.lib2 - No external libraries. - checked Rat report: modified license header in src/org/netbeans/api/editor/caret/package.html - skimmed through the module, did not notice additional problems You can merge this pull request into a Git repository by running: $ git pull https://github.com/vieiro/incubator-netbeans netbeans-54-module-review-editor.lib2 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/38.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #38 ---- commit cb443c2efbbd41df528c4166f0b0a629d899cec5 Author: Antonio Vieiro <antonio@vieiro.net> Date: 2017-10-02T10:46:40Z [NETBEANS-54] Module Review editor.lib2 - No external libraries. - checked Rat report: modified license header in src/org/netbeans/api/editor/caret/package.html - skimmed through the module, did not notice additional problems ----
          123. GitHub user junichi11 opened a pull request: https://github.com/apache/incubator-netbeans/pull/39 [NETBEANS-54] Module Review bugzilla - no external library - checked Rat report: update the license header in BugzillaRepository.java - skimmed through the module, did not notice additional problems You can merge this pull request into a Git repository by running: $ git pull https://github.com/junichi11/incubator-netbeans module-review-bugzilla Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/39.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #39 ---- commit 036bda8db4785d873531e7dcfde14b2f80e3d1e9 Author: Junichi Yamamoto <junichi11@apache.org> Date: 2017-10-02T04:44:14Z [NETBEANS-54] Module Review bugzilla - no external library - checked Rat report: update the license header in BugzillaRepository.java - skimmed through the module, did not notice additional problems ----
          124. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/34 Looks good, I'd adjust the commit message though to contain something like "[NETBEANS-54] Module review libs.jna". The first line ise used as summary of the commit and now this looks a bit strange. (Same applies to #33 and #35).
          125. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/31 @juneau001 please rereview this changeset - now your PR would remove headers from .form files. While your at it: rebase your changes onto the current HEAD of master and squash the changes together.
          126. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/39 The change looks good.
          127. GitHub user junichi11 opened a pull request: https://github.com/apache/incubator-netbeans/pull/40 [NETBEANS-54] Module Review c.googlecode.javaewah.JavaEWAH - external library JavaEWAH-0.7.9.jar: Maven coordinates added. - checked Rat report: everything has been relicensed to Apache, included in 'central problems' list above, or excluded via Rat - skimmed through the module, did not notice additional problems You can merge this pull request into a Git repository by running: $ git pull https://github.com/junichi11/incubator-netbeans module-review-c.googlecode.javaewah.JavaEWAH Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/40.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #40 ---- commit ad8164822b09cc5d8045dfffe29518f3262103da Author: Junichi Yamamoto <junichi11@apache.org> Date: 2017-10-02T22:41:37Z [NETBEANS-54] Module Review c.googlecode.javaewah.JavaEWAH - external library JavaEWAH-0.7.9.jar: Maven coordinates added. - checked Rat report: everything has been relicensed to Apache, included in 'central problems' list above, or excluded via Rat - skimmed through the module, did not notice additional problems ----
          128. GitHub user junichi11 opened a pull request: https://github.com/apache/incubator-netbeans/pull/41 [NETBEANS-54] Module Review c.google.guava - external library guava-15.0.jar: Maven coordinates added. - checked Rat report: everything has been relicensed to Apache, included in 'central problems' list above, or excluded via Rat - skimmed through the module, did not notice additional problems You can merge this pull request into a Git repository by running: $ git pull https://github.com/junichi11/incubator-netbeans module-review-c.google.guava Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/41.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #41 ---- commit 93c1dbad03e1d78a9cb0dc93031d559d56b8345d Author: Junichi Yamamoto <junichi11@apache.org> Date: 2017-10-02T22:59:55Z [NETBEANS-54] Module Review c.google.guava - external library guava-15.0.jar: Maven coordinates added. - checked Rat report: everything has been relicensed to Apache, included in 'central problems' list above, or excluded via Rat - skimmed through the module, did not notice additional problems ----
          129. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/38
          130. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/37
          131. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/37 Merged with 3 positive reviews - Thank you.
          132. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/38 Merged with 2 positive reviews.
          133. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/20
          134. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/20 Merged with one positive review - thanks for reviewing.
          135. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/30
          136. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/30 Merged into master with 1 positive review. Thank you for reviewing.
          137. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/22
          138. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/22 Merged with 1 positive review. Thanks for having a look.
          139. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/40 Looks good.
          140. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/41 This is nitpicking but as the target is cleanup I hope you understand: - the license file should match the binary `<binaryname>.zip` should be accompanied by `<binaryname>-icense.txt` in this case `guava-15.0-license.jar` - in the license file the version should be corrected to `15.0` Thanks :-)
          141. Github user juneau001 commented on the issue: https://github.com/apache/incubator-netbeans/pull/31 @matthiasblaesing Thanks for the note. Very sorry for causing an issue, I thought that you wanted me to remove the license headers from the .form files, per the "Problems to be solved centrally" of https://cwiki.apache.org/confluence/display/NETBEANS/List+of+Modules+to+Review as I originally had added license headers to these files. I believe that I also should remove the license headers from the project.properties, build.xml, and build-impl.xml since they should also be solved centrally...so I should back out all changes that I made since each of the files was in that list? I appreciate the assistance.
          142. Github user junichi11 commented on the issue: https://github.com/apache/incubator-netbeans/pull/41 @matthiasblaesing Thanks for looking at it :) Fixed. I hope that my understanding is correct.
          143. GitHub user vieiro opened a pull request: https://github.com/apache/incubator-netbeans/pull/42 [NETBEANS-54] Module Review editor - No external libraries. - Checked Rat report: added license to project files. Did NOT add license to editor/demosrc/README nor to the rest of test files. - Unit tests org.netbeans.editor.PlainDocumentCompatibilityRandomTest and org.netbeans.modules.editor.NbEditorToolBarTest fail (but they were also failing before this PR). - QA Tests should be run. You can merge this pull request into a Git repository by running: $ git pull https://github.com/vieiro/incubator-netbeans netbeans-54-module-review-editor Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/42.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #42 ---- commit 6f7d84fb96fc8e64bf0a0efcca09feeabd6d92d8 Author: Antonio Vieiro <antonio@vieiro.net> Date: 2017-10-03T07:14:10Z [NETBEANS-54] Module Review editor - No external libraries. - Checked Rat report: added license to project files. Did NOT add license to editor/demosrc/README nor to the rest of test files. - Unit tests org.netbeans.editor.PlainDocumentCompatibilityRandomTest and org.netbeans.modules.editor.NbEditorToolBarTest fail (but they were also failing before this PR). - QA Tests should be run. ----
          144. GitHub user vieiro opened a pull request: https://github.com/apache/incubator-netbeans/pull/43 [NETBEANS-54] Module Review editor.bookmarks - No external libraries. - Checked Rat report: added license headres to qa-functional projects. - Skimmed through the module, did not notice additional problems You can merge this pull request into a Git repository by running: $ git pull https://github.com/vieiro/incubator-netbeans netbeans-54-module-review-editor.bookmarks Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/43.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #43 ---- commit ed32d9b9c2886bde81ed1dedec4ec8de8efa5877 Author: Antonio Vieiro <antonio@vieiro.net> Date: 2017-10-03T08:10:20Z [NETBEANS-54] Module Review editor.bookmarks - No external libraries. - Checked Rat report: added license headres to qa-functional projects. - Skimmed through the module, did not notice additional problems ----
          145. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/41 For me this looks good - thanks for taking care!
          146. GitHub user rtaneja1 opened a pull request: https://github.com/apache/incubator-netbeans/pull/45 [NETBEANS-54] Module Review masterfs.ui Added Apache license header in bundle.properties You can merge this pull request into a Git repository by running: $ git pull https://github.com/rtaneja1/incubator-netbeans license-fixes-0310 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/45.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #45 ---- commit 6db1eac14042c5305781ca66d0d86ba55a38e6a2 Author: Reema Taneja <reema.taneja@oracle.com> Date: 2017-10-03T10:46:19Z [NETBEANS-54] Module Review masterfs.ui ----
          147. GitHub user junichi11 opened a pull request: https://github.com/apache/incubator-netbeans/pull/47 [NETBEANS-54] Module Review c.jcraft.jsch - external library jsch-0.1.54.jar: BSD-jsch-variant. Maven coordinates added. - checked Rat report: everything has been relicensed to Apache, included in 'central problems' list above, or excluded via Rat - skimmed through the module, did not notice additional problems You can merge this pull request into a Git repository by running: $ git pull https://github.com/junichi11/incubator-netbeans module-review-c.jcraft.jsch Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/47.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #47 ---- commit 2b8ce27c354e86ecec967b9d368b5f49b9d97d5f Author: Junichi Yamamoto <junichi11@apache.org> Date: 2017-10-03T09:40:47Z [NETBEANS-54] Module Review c.jcraft.jsch - external library jsch-0.1.54.jar: BSD-jsch-variant. Maven coordinates added. - checked Rat report: everything has been relicensed to Apache, included in 'central problems' list above, or excluded via Rat - skimmed through the module, did not notice additional problems ----
          148. GitHub user junichi11 opened a pull request: https://github.com/apache/incubator-netbeans/pull/48 [NETBEANS-54] Module Review c.jcraft.jzlib - external library jzlib-1.0.7.jar: BSD-jzlib-variant. Maven coordinates added. - checked Rat report: everything has been relicensed to Apache, included in 'central problems' list above, or excluded via Rat - skimmed through the module, did not notice additional problems You can merge this pull request into a Git repository by running: $ git pull https://github.com/junichi11/incubator-netbeans module-review-c.jcraft.jzlib Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/48.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #48 ---- commit 8245e69e073caeebf61099fd6c98f16232565386 Author: Junichi Yamamoto <junichi11@apache.org> Date: 2017-10-03T11:03:06Z [NETBEANS-54] Module Review c.jcraft.jzlib - external library jzlib-1.0.7.jar: BSD-jzlib-variant. Maven coordinates added. - checked Rat report: everything has been relicensed to Apache, included in 'central problems' list above, or excluded via Rat - skimmed through the module, did not notice additional problems ----
          149. GitHub user matthiasblaesing opened a pull request: https://github.com/apache/incubator-netbeans/pull/49 [NETBEANS-54] Add license header to binaries-list Add Apache License header to binaries-list. Excluded from this commit are: - db.sql.visualeditor - libs.felix - libs.jna - libs.jna.platform For these PRs are open, that already add a license header. Apart from the license adding/adaption, there are a few whitespace changes, where the file did not contain a final newline. You can merge this pull request into a Git repository by running: $ git pull https://github.com/matthiasblaesing/incubator-netbeans binaries-list Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/49.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #49 ---- commit f44b0c89e18eb7c4b9d19a924e0fd1344763c3c8 Author: Matthias Bläsing <mblaesing@doppel-helix.eu> Date: 2017-10-03T11:13:11Z [NETBEANS-54] Add license header to binaries-list Add Apache License header to binaries-list. Excluded from this commit are: - db.sql.visualeditor - libs.felix - libs.jna - libs.jna.platform For these PRs are open, that already add a license header. ----
          150. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/31 The problem is that you added the license headers, that conflicted with the central change the @jlahoda kindly did (fixing a great many files). Now your changeset removes these headers again. On github you can see in the "Files changed" section what would happen if your PR is merged and in this case the correct headers are removed for form files. So: - please rebase your changes onto master - please revert your changes to the form files - please also revert the change to genfiles.properties (See: https://github.com/apache/incubator-netbeans/pull/46/commits/40a715ad91e47696a8018c48c7ad091b9c4341ec) as that is a generated file The rest looks good. The whitespace changes in build.xml are the removal of trailing spaces, which I think is ok.
          151. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/31 Oh - and no reason for apologies! The work is appreciated.
          152. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/32 Thank you - I merged the changes into master with 2 positive reviews. I suggest, that you include the full name into the author field, user names look strange. The merge can be found here: https://github.com/apache/incubator-netbeans/commit/9a152a75f50f53219b3b2669b6ab9e69a9beb1d7 Please close this PR yourself.
          153. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/47 Looks good.
          154. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/48 Looks good.
          155. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/45 Looks good.
          156. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/43 Looks good.
          157. Github user emilianbold commented on the issue: https://github.com/apache/incubator-netbeans/pull/18 Committed.
          158. Github user emilianbold closed the pull request at: https://github.com/apache/incubator-netbeans/pull/18
          159. Github user emilianbold commented on the issue: https://github.com/apache/incubator-netbeans/pull/17 Committed.
          160. Github user emilianbold closed the pull request at: https://github.com/apache/incubator-netbeans/pull/17
          161. Github user emilianbold commented on the issue: https://github.com/apache/incubator-netbeans/pull/14 Merged.
          162. Github user emilianbold closed the pull request at: https://github.com/apache/incubator-netbeans/pull/14
          163. GitHub user matthiasblaesing opened a pull request: https://github.com/apache/incubator-netbeans/pull/50 [NETBEANS-54] Module review diff - no external library - checked Rat report; ignored l10n.list (see central problems) and added ingore entries for rat report. - skimmed through the module, did not notice additional problems You can merge this pull request into a Git repository by running: $ git pull https://github.com/matthiasblaesing/incubator-netbeans diff-review Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/50.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #50 ---- commit 3961ee1ba18ca30a7d7a0c6d640ad0b15b7e7162 Author: Matthias Bläsing <mblaesing@doppel-helix.eu> Date: 2017-10-03T15:03:51Z [NETBEANS-54] Module review diff - no external library - checked Rat report; ignored l10n.list (see central problems) and added ingore entries for rat report. - skimmed through the module, did not notice additional problems ----
          164. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/10
          165. GitHub user matthiasblaesing opened a pull request: https://github.com/apache/incubator-netbeans/pull/51 [NETBEANS-54] Module review docker.editor - no external library - checked Rat report; manually updated license header in Dockerfile - skimmed through the module, did not notice additional problems You can merge this pull request into a Git repository by running: $ git pull https://github.com/matthiasblaesing/incubator-netbeans docker.editor-review Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/51.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #51 ---- commit 2988ec3b199a0bb91917f2f4fd1018c5231bed8f Author: Matthias Bläsing <mblaesing@doppel-helix.eu> Date: 2017-10-03T15:15:50Z [NETBEANS-54] Module review docker.editor - no external library - checked Rat report; manually updated license header in Dockerfile - skimmed through the module, did not notice additional problems ----
          166. Github user borxa closed the pull request at: https://github.com/apache/incubator-netbeans/pull/32
          167. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/13
          168. Github user emilianbold commented on the issue: https://github.com/apache/incubator-netbeans/pull/47 @junichi11 will you commit this yourself?
          169. Github user emilianbold commented on the issue: https://github.com/apache/incubator-netbeans/pull/41 Feel free to commit.
          170. Github user junichi11 commented on the issue: https://github.com/apache/incubator-netbeans/pull/47 @emilianbold Yes. Are the following steps OK if I push my changes myself? ``` $ cd incubator-netbeans $ git remote add upstream-apache https://git-wip-us.apache.org/repos/asf/incubator-netbeans $ git checkout master $ git pull upstream-apache master $ git push origin master $ git checkout module-review-branch $ git rebase master module-review-branch $ git push -f origin module-review-branch $ git checkout master $ git merge module-review-branch $ git push upstream-apache master ```
          171. Github user emilianbold commented on the issue: https://github.com/apache/incubator-netbeans/pull/47 These look good to me. Before doing the final push you might do:
          172. Github user junichi11 commented on the issue: https://github.com/apache/incubator-netbeans/pull/47 Thank you for it :) I'll push changes tomorrow.
          173. Github user jlahoda commented on the issue: https://github.com/apache/incubator-netbeans/pull/49 To me personally, looks OK.
          174. GitHub user vieiro opened a pull request: https://github.com/apache/incubator-netbeans/pull/53 [NETBEANS-54] Module Review editor.codetemplates * No external libraries. * A nbproject/*sig that will be handled centrally. * Some text xml files wihout license header. * Test org.netbeans.lib.editor.codetemplates.CodeTemplatesTest FAILED... ... but ant -Dtest-unit-sys-prop.ignore.random.failures=true test did not fail. * Did you know that NetBeans DeveloperX2 was released in the spring of 1998? You can merge this pull request into a Git repository by running: $ git pull https://github.com/vieiro/incubator-netbeans netbeans-54-module-review-editor.codetemplates Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/53.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #53 ---- commit da1da87d7f2bf5a7183a4f5d703cab1311c46040 Author: Antonio Vieiro <antonio@vieiro.net> Date: 2017-10-03T20:48:49Z [NETBEANS-54] Module Review editor.codetemplates * No external libraries. * A nbproject/*sig that will be handled centrally. * Some text xml files wihout license header. * Test org.netbeans.lib.editor.codetemplates.CodeTemplatesTest FAILED... ... but ant -Dtest-unit-sys-prop.ignore.random.failures=true test did not fail. * Did you know that NetBeans DeveloperX2 was released in the spring of 1998? ----
          175. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/47
          176. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/48
          177. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/41
          178. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/40
          179. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/39
          180. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/28
          181. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/27
          182. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/26
          183. Github user jlahoda commented on the issue: https://github.com/apache/incubator-netbeans/pull/47 Please note that this changes fail the build, because the jar from maven central has a different hash. The hash on the central is: DA3584329A263616E277E15462B387ADDD1B208D I skimmed through the differences, and so far it seems to me it is OK to use the jar from central (we presumably would eventually learn if there would be issues anyway). I can do that tonight, unless someone will do that before.
          184. Github user junichi11 commented on the issue: https://github.com/apache/incubator-netbeans/pull/47 @jlahoda I'm sorry... Would you please do that?
          185. Github user emilianbold commented on the issue: https://github.com/apache/incubator-netbeans/pull/47 You know, I was just thinking how super useful it is to have the hash when switching to Maven Central since at least you know it's the same JAR. How could they differ for the same library?
          186. GitHub user vieiro opened a pull request: https://github.com/apache/incubator-netbeans/pull/55 [NETBEANS-54] Module Review editor.completion - No external libraries. - Updated licenses in apichanges.xml and a Bundle.properties file as per rat report. - Tests passing. No additional problems found. You can merge this pull request into a Git repository by running: $ git pull https://github.com/vieiro/incubator-netbeans netbeans-54-module-review-editor.completion Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/55.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #55 ---- commit f300576ecf8f5f2ab99b44c56ca3f088bab8dee1 Author: Antonio Vieiro <antonio@vieiro.net> Date: 2017-10-04T07:52:49Z [NETBEANS-54] Module Review editor.completion - No external libraries. - Updated licenses in apichanges.xml and a Bundle.properties file as per rat report. - Tests passing. No additional problems found. ----
          187. Github user jlahoda commented on the issue: https://github.com/apache/incubator-netbeans/pull/47 I agree the hash is useful (among other things) to verify that the jar from the central is the same. But it is unfortunately not the same in this case. Seems the jar on hg/binaries is the same as a download from the JSch web page, and the jar on maven central is different. My wild guess is that these have been produced by different build processes and different JDKs.
          188. GitHub user vieiro opened a pull request: https://github.com/apache/incubator-netbeans/pull/56 [NETBEANS-54] Module Review editor.errorstripe - No external binaries. - Updated licenses in two layer.xml files. - Two unit tests failed: org.netbeans.modules.editor.errorstripe.AnnotationViewDataImplTest org.netbeans.modules.editor.errorstripe.AnnotationViewTest - No additional problems found. You can merge this pull request into a Git repository by running: $ git pull https://github.com/vieiro/incubator-netbeans netbeans-54-module-review-editor.errorstripe Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/56.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #56 ---- commit 9a76df3c614a3542d504e02a38fb7cef344f7f45 Author: Antonio Vieiro <antonio@vieiro.net> Date: 2017-10-04T09:18:59Z [NETBEANS-54] Module Review editor.errorstripe - No external binaries. - Updated licenses in two layer.xml files. - Two unit tests failed: org.netbeans.modules.editor.errorstripe.AnnotationViewDataImplTest org.netbeans.modules.editor.errorstripe.AnnotationViewTest - No additional problems found. ----
          189. GitHub user emilianbold opened a pull request: https://github.com/apache/incubator-netbeans/pull/57 [NETBEANS-54] Module Review parsing.api - No external binaries. - Updated licenses in arch.xml - No additional problems found. You can merge this pull request into a Git repository by running: $ git pull https://github.com/emilianbold/incubator-netbeans emi-review-parsing.api Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/57.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #57 ---- commit e2c63ff9476dd977647dc87dd3a84777816503b9 Author: Emilian Bold <emi@apache.org> Date: 2017-10-04T14:29:46Z [NETBEANS-54] Module Review parsing.api - No external binaries. - Updated licenses in arch.xml - No additional problems found. ----
          190. GitHub user emilianbold opened a pull request: https://github.com/apache/incubator-netbeans/pull/58 [NETBEANS-54] Module Review parsing.nb You can merge this pull request into a Git repository by running: $ git pull https://github.com/emilianbold/incubator-netbeans emi-review-parsing.nb Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/58.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #58 ---- commit c02b9bf06c09175101ea8385eb2dfdd2c30a4dcc Author: Emilian Bold <emi@apache.org> Date: 2017-10-04T14:36:52Z [NETBEANS-54] Module Review parsing.nb ----
          191. GitHub user emilianbold opened a pull request: https://github.com/apache/incubator-netbeans/pull/59 [NETBEANS-54] Module Review parsing.indexing You can merge this pull request into a Git repository by running: $ git pull https://github.com/emilianbold/incubator-netbeans emi-review-parsing.indexing Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/59.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #59 ---- commit c8b6d76cc55dd10f629a553342a92f4572e2a424 Author: Emilian Bold <emi@apache.org> Date: 2017-10-04T14:48:49Z [NETBEANS-54] Module Review parsing.indexing ----
          192. GitHub user emilianbold opened a pull request: https://github.com/apache/incubator-netbeans/pull/60 [NETBEANS-54] Module Review spellchecker You can merge this pull request into a Git repository by running: $ git pull https://github.com/emilianbold/incubator-netbeans emi-review-spellchecker Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/60.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #60 ---- ----
          193. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/51
          194. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/60 Looks good.
          195. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/59 Looks good.
          196. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/58 Looks good.
          197. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/57 Looks good.
          198. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/56 Looks good.
          199. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/55 Looks good.
          200. Github user matthiasblaesing closed the pull request at: https://github.com/apache/incubator-netbeans/pull/50
          201. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/24
          202. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/16
          203. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/49
          204. GitHub user ikysil opened a pull request: https://github.com/apache/incubator-netbeans/pull/62 [NETBEANS-54] Module Review hibernate - external binary contains DTDs for Hibernate 3.0 configuration files - changed license headers for files reported by Rat - replacing the bundled binary is tracked by https://issues.apache.org/jira/browse/NETBEANS-79 You can merge this pull request into a Git repository by running: $ git pull https://github.com/ikysil/incubator-netbeans netbeans-54-review-hibernate Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/62.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #62 ---- commit 5f5ba9225902f8c38a09f14001af5d412f5c0f64 Author: Illya Kysil <ikysil@ikysil.name> Date: 2017-10-04T19:48:37Z [NETBEANS-54] Module Review hibernate - changed license headers for files reported by Rat ----
          205. GitHub user junichi11 opened a pull request: https://github.com/apache/incubator-netbeans/pull/63 [NETBEANS-54] Module Review csl.api - no external library - checked Rat report: update the license header in csl.api/src/org/netbeans/modules/csl/editor/semantic/Bundle.properties. ignore manifest.mf and *.txt - skimmed through the module, did not notice additional problems You can merge this pull request into a Git repository by running: $ git pull https://github.com/junichi11/incubator-netbeans module-review-csl.api Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/63.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #63 ---- commit 7797f43412cb8463736ac495ed7a80193814a770 Author: Junichi Yamamoto <junichi11@apache.org> Date: 2017-10-03T16:01:40Z [NETBEANS-54] Module Review csl.api - no external library - checked Rat report: update the license header in csl.api/src/org/netbeans/modules/csl/editor/semantic/Bundle.properties. ignore manifest.mf and *.txt - skimmed through the module, did not notice additional problems ----
          206. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/60
          207. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/57
          208. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/59
          209. Github user emilianbold closed the pull request at: https://github.com/apache/incubator-netbeans/pull/58
          210. Github user matthiasblaesing commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/62#discussion_r143012148 --- Diff: hibernate/src/org/netbeans/modules/hibernate/resources/HibernateRevengTemplate.xml --- @@ -1,2 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> --- End diff -- From the name this looks to be a template for a user file. If so, I would not include an apache license here, if it ends up int he users code base. There is no real IP here, so I'd be just annoyed if I'd have to remove/replace the license by hand.
          211. Github user ikysil commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/62#discussion_r143025054 --- Diff: hibernate/src/org/netbeans/modules/hibernate/resources/HibernateRevengTemplate.xml --- @@ -1,2 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> --- End diff -- Okay, I see.
          212. Github user juneau001 commented on the issue: https://github.com/apache/incubator-netbeans/pull/31 Hi @matthiasblaesing is the code looking okay now? I've done what was mentioned. That is, I rebased changes on to master, reverted my changes to form files and genfiles.properties. Let me know how things look now. Thanks
          213. Github user emilianbold commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/31#discussion_r143058334 --- Diff: j2ee.core.utilities/src/org/netbeans/modules/j2ee/core/support/java/method/ParametersPanel.form --- @@ -1,26 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<!-- - --- End diff -- ... and this.
          214. Github user emilianbold commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/31#discussion_r143058725 --- Diff: j2ee.core.utilities/test/unit/data/JavaApp/nbproject/build-impl.xml --- @@ -21,9 +41,9 @@ is divided into following sections: --> <project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject2="http://www.netbeans.org/ns/j2se-project/2" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="JavaApp-impl"> <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/> - <!-- --- End diff -- More whitespace.
          215. Github user emilianbold commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/31#discussion_r143058295 --- Diff: j2ee.core.utilities/src/org/netbeans/modules/j2ee/core/support/java/method/MethodCustomizerPanel.form --- @@ -1,26 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<!-- --- End diff -- This should also be reverted.
          216. Github user emilianbold commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/31#discussion_r143058623 --- Diff: j2ee.core.utilities/test/unit/data/JavaApp/build.xml --- @@ -35,20 +56,20 @@ </obfuscate> </target> - For list of available properties check the imported - nbproject/build-impl.xml file. + For list of available properties check the imported + nbproject/build-impl.xml file. Another way to customize the build is by overriding existing main targets. - The targets of interest are: + The targets of interest are: -init-macrodef-javac: defines macro for javac compilation -init-macrodef-junit: defines macro for junit execution -init-macrodef-debug: defines macro for class debugging -init-macrodef-java: defines macro for class execution -do-jar-with-manifest: JAR building (if you are using a manifest) -do-jar-without-manifest: JAR building (if you are not using a manifest) - run: execution of project + run: execution of project --- End diff -- More whitespace.
          217. Github user emilianbold commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/31#discussion_r143058704 --- Diff: j2ee.core.utilities/test/unit/data/JavaApp/nbproject/build-impl.xml --- @@ -1,5 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at --- End diff -- This is OK.
          218. Github user emilianbold commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/31#discussion_r143058683 --- Diff: j2ee.core.utilities/test/unit/data/JavaApp/build.xml --- @@ -60,10 +81,10 @@ </exec> </target> - Notice that the overridden target depends on the jar target and not only on - the compile target as the regular run target does. Again, for a list of available + Notice that the overridden target depends on the jar target and not only on --- End diff -- More whitespace.
          219. Github user emilianbold commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/31#discussion_r143058252 --- Diff: j2ee.core.utilities/src/org/netbeans/modules/j2ee/core/support/java/method/ExceptionsPanel.form --- @@ -1,26 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<!-- --- End diff -- This should be reverted.
          220. Github user emilianbold commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/31#discussion_r143058376 --- Diff: j2ee.core.utilities/test/unit/data/JavaApp/build.xml --- @@ -1,4 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file --- End diff -- This is OK.
          221. Github user emilianbold commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/31#discussion_r143058527 --- Diff: j2ee.core.utilities/test/unit/data/JavaApp/build.xml --- @@ -7,9 +28,9 @@ <import file="nbproject/build-impl.xml"/> <!-- - There exist several targets which are by default empty and which can be - used for execution of your tasks. These targets are usually executed - before and after some main targets. They are: + There exist several targets which are by default empty and which can be + used for execution of your tasks. These targets are usually executed --- End diff -- These whitespace changes are not necessary. I generally prefer the patch to contain only the fix, not reformatting.
          222. Github user emilianbold commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/31#discussion_r143058793 --- Diff: j2ee.core.utilities/test/unit/data/JavaApp/nbproject/project.xml --- @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance --- End diff -- OK.
          223. Github user emilianbold commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/31#discussion_r143058582 --- Diff: j2ee.core.utilities/test/unit/data/JavaApp/build.xml --- @@ -35,20 +56,20 @@ </obfuscate> </target> - For list of available properties check the imported - nbproject/build-impl.xml file. + For list of available properties check the imported + nbproject/build-impl.xml file. Another way to customize the build is by overriding existing main targets. - The targets of interest are: + The targets of interest are: --- End diff -- More whitespace.
          224. Github user emilianbold commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/31#discussion_r143058744 --- Diff: j2ee.core.utilities/test/unit/data/JavaApp/nbproject/project.properties --- @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance --- End diff -- OK
          225. Github user emilianbold commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/31#discussion_r143058559 --- Diff: j2ee.core.utilities/test/unit/data/JavaApp/build.xml --- @@ -35,20 +56,20 @@ </obfuscate> </target> - For list of available properties check the imported - nbproject/build-impl.xml file. --- End diff -- More whitespace.
          226. Github user juneau001 commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/31#discussion_r143059352 --- Diff: j2ee.core.utilities/src/org/netbeans/modules/j2ee/core/support/java/method/ExceptionsPanel.form --- @@ -1,26 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<!-- --- End diff -- Thanks @emilianbold, can I ask why to revert the .form changes? I took the license headers out because these are auto-generated and I mistakingly put them in the first time.
          227. Github user emilianbold commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/31#discussion_r143059710 --- Diff: j2ee.core.utilities/src/org/netbeans/modules/j2ee/core/support/java/method/ExceptionsPanel.form --- @@ -1,26 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<!-- --- End diff -- In the mean time the decision was to put them in. And they were added all over the codebase automatically, via a script. So now your commit appears to remove what was just added.
          228. Github user juneau001 commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/31#discussion_r143060074 --- Diff: j2ee.core.utilities/src/org/netbeans/modules/j2ee/core/support/java/method/ExceptionsPanel.form --- @@ -1,26 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<!-- --- End diff -- I'm sorry about that. I am thinking that I will close this pull request and start fresh...sound ok? Thanks
          229. Github user emilianbold commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/31#discussion_r143060563 --- Diff: j2ee.core.utilities/src/org/netbeans/modules/j2ee/core/support/java/method/ExceptionsPanel.form --- @@ -1,26 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<!-- --- End diff -- Don't. Just start in another branch on your local machine then push that into your master branch on github (eventually with --force). The existing PR will pick the updated changesets and we can go from there.
          230. Github user juneau001 closed the pull request at: https://github.com/apache/incubator-netbeans/pull/31
          231. GitHub user juneau001 opened a pull request: https://github.com/apache/incubator-netbeans/pull/64 [NETBEANS-54] Module Review j2ee.core.utilities - no external libraries - checked Rat report, added license header to project.xml, other headers looked ok. Ignored problems to be resolved centrally. - skimmed module and did not see any other issues You can merge this pull request into a Git repository by running: $ git pull https://github.com/juneau001/incubator-netbeans master Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/64.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #64 ---- commit 1c33153b40ec0caebc913f6e63373736a47d4258 Author: Josh Juneau <juneau001@gmail.com> Date: 2017-10-06T04:35:45Z [NETBEANS-54] Module Review j2ee.core.utilities ----
          232. Github user emilianbold commented on the issue: https://github.com/apache/incubator-netbeans/pull/64 Perfect!
          233. Github user junichi11 commented on the issue: https://github.com/apache/incubator-netbeans/pull/65 You should also fix the commit message. In your case, `[NETBEANS-54] Module Review editor.settings.lib` see [List of Modules to Review](https://cwiki.apache.org/confluence/display/NETBEANS/List+of+Modules+to+Review): > When done commit the changes with a commit message that starts with first line "[NETBEANS-54] Module Review `<module>`" (`<module>` should be replaced with the module you reviewed) and a message body describing your review, see the comments section below for samples. The changeset should then be proposed for merging via a PR. Thanks.
          234. GitHub user subhash-koganti opened a pull request: https://github.com/apache/incubator-netbeans/pull/66 [NETBEANS-54] Module Review editor.settings.lib - Added Apache License - no external libraries - checked Rat report and found 11 XML files that don't have any license info defined on them. Added the license text on to them . - After adding the text , Recompiled the code and ran the rat report again and Made sure that these files are fixed in the rat report . - skimmed through the module, did not notice any additional problems You can merge this pull request into a Git repository by running: $ git pull https://github.com/subhash-koganti/incubator-netbeans master Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/66.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #66 ---- commit da72fc10aa35921db7529d23b45bf9bb62d8f371 Author: subhash-koganti <subhash.koganti@gmail.com> Date: 2017-10-06T05:10:50Z [NETBEANS-54] Module Review editor.settings.lib - Added Apache License ----
          235. Github user junichi11 commented on the issue: https://github.com/apache/incubator-netbeans/pull/66 Thanks for fixing it. BTW, You should create a new branch, then commit your changes. maybe, since next time?
          236. GitHub user junichi11 opened a pull request: https://github.com/apache/incubator-netbeans/pull/67 [NETBEANS-54] Module Review team.commons - no external library - checked Rat report: update the license header in package-info.java. ignore manifest.mf - skimmed through the module, did not notice additional problems You can merge this pull request into a Git repository by running: $ git pull https://github.com/junichi11/incubator-netbeans module-review-team.commons Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/67.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #67 ---- commit bdf35ca35d1b5c89e4059517f7fce0e7f5f12e7f Author: Junichi Yamamoto <junichi11@apache.org> Date: 2017-10-06T00:19:12Z [NETBEANS-54] Module Review team.commons - no external library - checked Rat report: update the license header in package-info.java. ignore manifest.mf - skimmed through the module, did not notice additional problems ----
          237. GitHub user junichi11 opened a pull request: https://github.com/apache/incubator-netbeans/pull/68 [NETBEANS-54] Module Review project.libraries - no external library - checked Rat report: update the license header in package.html. ignore uispec.txt, org-netbeans-modules-project-libraries.sig, and manifest.mf - skimmed through the module, did not notice additional problems You can merge this pull request into a Git repository by running: $ git pull https://github.com/junichi11/incubator-netbeans module-review-project.libraries Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/68.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #68 ---- commit eb9ea7f30ffc93532ee3d7b5dd36192a6bc923a7 Author: Junichi Yamamoto <junichi11@apache.org> Date: 2017-10-06T10:22:54Z [NETBEANS-54] Module Review project.libraries - no external library - checked Rat report: update the license header in package.html. ignore uispec.txt, org-netbeans-modules-project-libraries.sig, and manifest.mf - skimmed through the module, did not notice additional problems ----
          238. GitHub user geertjanw opened a pull request: https://github.com/apache/incubator-netbeans/pull/69 [NETBEANS-54] Module Review api.visual Changed the license in the examples-readme.txt. You can merge this pull request into a Git repository by running: $ git pull https://github.com/geertjanw/incubator-netbeans master Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/69.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #69 ---- commit a1a47ca5f8d3a0991b1969617116c9de6f6f0001 Author: geertjan <geertjan.wielenga@oracle.com> Date: 2017-10-06T14:25:05Z [NETBEANS-54] Module Review api.visual ----
          239. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/69 Looks good
          240. Github user ikysil commented on the issue: https://github.com/apache/incubator-netbeans/pull/62 @matthiasblaesing Could you please do another round of review?
          241. Github user subhash-koganti commented on the issue: https://github.com/apache/incubator-netbeans/pull/66 sure sounds good.I am new to the group. Not sure what the process was. I was told to do a fork . But if Branching is the process , I will branch it next time. By the way is there a document where this is specified ?
          242. Github user geertjanw closed the pull request at: https://github.com/apache/incubator-netbeans/pull/69
          243. GitHub user varaghar opened a pull request: https://github.com/apache/incubator-netbeans/pull/73 [NETBEANS-54] Module Review #167 You can merge this pull request into a Git repository by running: $ git pull https://github.com/varaghar/incubator-netbeans master Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/73.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #73 ---- commit 6a3d4ea36455fd04f4a5f7754cd97f225f6d18d9 Author: Jozsef.Kerekes <jozsef.kerekes@isdc.eu> Date: 2017-10-06T23:32:41Z [NETBEANS-54] Module Review #167 ----
          244. Github user junichi11 commented on the issue: https://github.com/apache/incubator-netbeans/pull/66 Probably, There is no document about it in the wiki. I think there is no problem even if a new branch is not created. But you may get a problem in your repository after your PR is merged. e.g. If your commits are rebased then merged in the upstream repository, the upstream repository has the different commit id from your one. To keep the master branch up-to-date with the upstream repository, I recommend that you use it :)
          245. Github user junichi11 commented on the issue: https://github.com/apache/incubator-netbeans/pull/73 Probably, you should send your PR to not `apache:master` but `emilianbold:master`. The commit message must be `[NETBEANS-54] Module Review <module name>`. In your case, `[NETBEANS-54] Module Review profiler.j2se`
          246. Github user junichi11 commented on the issue: https://github.com/apache/incubator-netbeans/pull/71 Probably, you should send your PR to not `apache:master` but `emilianbold:master`. The commit message must be `[NETBEANS-54] Module Review <module name>`. In your case, `[NETBEANS-54] Module Review updatecenters`
          247. Github user varaghar commented on the issue: https://github.com/apache/incubator-netbeans/pull/73 Thank you for the response, I will update this.
          248. Github user junichi11 commented on the issue: https://github.com/apache/incubator-netbeans/pull/42 Merged in 215acff0f9714513987031fae8bf329b0514789c. @vieiro Do you mind closing this PR?
          249. Github user junichi11 commented on the issue: https://github.com/apache/incubator-netbeans/pull/43 Merged in 9117c00eabdabc179ccb4055044fcbb2ab40039a. @vieiro Do you mind closing this PR? Thanks!
          250. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/36
          251. Github user junichi11 commented on the issue: https://github.com/apache/incubator-netbeans/pull/45 Merged in 215043377068868481619d203e0312131294206b. @rtaneja1 Do you mind closing this PR? Thanks!
          252. GitHub user junichi11 opened a pull request: https://github.com/apache/incubator-netbeans/pull/74 [NETBEANS-54] Module Review terminal - no external library - checked Rat report: add the license header in README.*. ignore manifest.mf - skimmed through the module, did not notice additional problems You can merge this pull request into a Git repository by running: $ git pull https://github.com/junichi11/incubator-netbeans module-review-terminal Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/74.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #74 ---- commit 23c0cbe25bb4cd97a886730dba0fd85fab279d02 Author: Junichi Yamamoto <junichi11@apache.org> Date: 2017-10-07T12:38:18Z [NETBEANS-54] Module Review terminal - no external library - checked Rat report: add the license header in README.*. ignore manifest.mf - skimmed through the module, did not notice additional problems ----
          253. GitHub user geertjanw opened a pull request: https://github.com/apache/incubator-netbeans/pull/75 [NETBEANS-54] Module Review api.templates You can merge this pull request into a Git repository by running: $ git pull https://github.com/geertjanw/incubator-netbeans netbeans-54-review-api.templates Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/75.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #75 ---- commit d06d586d745a60d711ffd0e9779ecf697467861a Author: geertjan <geertjan.wielenga@oracle.com> Date: 2017-10-07T12:59:09Z [NETBEANS-54] Module Review api.templates ----
          254. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/5 This PR was created nearly two weeks ago - I'll merge this tomorrow, if no one issues a veto.
          255. GitHub user geertjanw opened a pull request: https://github.com/apache/incubator-netbeans/pull/76 [NETBEANS-54] Module Review api.visual You can merge this pull request into a Git repository by running: $ git pull https://github.com/geertjanw/incubator-netbeans netbeans-54-review-api.visual Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/76.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #76 ---- commit 684306372dbebb72fc978064e77016556e808796 Author: geertjan <geertjan.wielenga@oracle.com> Date: 2017-10-07T13:06:24Z [NETBEANS-54] Module Review api.visual ----
          256. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/76 Looks good.
          257. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/75 Looks good.
          258. GitHub user geertjanw opened a pull request: https://github.com/apache/incubator-netbeans/pull/77 [NETBEANS-54] Module Review api.search You can merge this pull request into a Git repository by running: $ git pull https://github.com/geertjanw/incubator-netbeans netbeans-54-review-api.search Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/77.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #77 ---- commit d6b8677c4b858d3ff734e2fe541ad27e0c9b1179 Author: geertjan <geertjan.wielenga@oracle.com> Date: 2017-10-07T13:24:57Z [NETBEANS-54] Module Review api.search ----
          259. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/77 The changes look to only touch files, that I would have seen under "central problems". The change itself looks good though.
          260. Github user geertjanw commented on the issue: https://github.com/apache/incubator-netbeans/pull/77 Right. I thought, basically, "let's just get it done".
          261. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/74 Looks good. I might have considered stripping the "#" signs, but that is bike-shedding, so no objection from me.
          262. GitHub user geertjanw opened a pull request: https://github.com/apache/incubator-netbeans/pull/78 [NETBEANS-54] Module Review autoupdate.services You can merge this pull request into a Git repository by running: $ git pull https://github.com/geertjanw/incubator-netbeans netbeans-54-review-autoupdate.services Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/78.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #78 ---- commit 8b059393a2d7932cbe094d7458801e35b58e806b Author: geertjan <geertjan.wielenga@oracle.com> Date: 2017-10-07T13:43:33Z [NETBEANS-54] Module Review autoupdate.services ----
          263. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/64 Looks good.
          264. Github user rtaneja1 closed the pull request at: https://github.com/apache/incubator-netbeans/pull/45
          265. Github user geertjanw commented on the issue: https://github.com/apache/incubator-netbeans/pull/77 Hope someone can do the merges of my PRs, such as this one, haven't got that working yet.
          266. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/75
          267. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/77
          268. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/78
          269. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/76
          270. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/77 Done.
          271. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/29
          272. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/62 Looks better, but you still introduce a change into HibernateRevengTemplate.xml. You add a XML prolog to the file, that was not there before. So could you please: - remove that also - rebase your changes onto master - squash your changes together into one changeset Thank you!
          273. Github user vieiro closed the pull request at: https://github.com/apache/incubator-netbeans/pull/43
          274. Github user vieiro commented on the issue: https://github.com/apache/incubator-netbeans/pull/43 Closing PR as requested.
          275. Github user vieiro commented on the issue: https://github.com/apache/incubator-netbeans/pull/42 Closing PR as requested.
          276. Github user vieiro closed the pull request at: https://github.com/apache/incubator-netbeans/pull/42
          277. GitHub user vieiro opened a pull request: https://github.com/apache/incubator-netbeans/pull/79 [NETBEANS-54] Module Review lexer.nbbridge - No external libraries. - One test failed: org.netbeans.modules.lexer.nbbridge.test.MimeLookupLanguageProv - Added license to a single layer.xml test file (not strictly required). You can merge this pull request into a Git repository by running: $ git pull https://github.com/vieiro/incubator-netbeans netbeans-54-module-review-lexer.nbbridge Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/79.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #79 ---- commit 18cc78320bd836ebd82e96ab3ca9e8aba4af219f Author: Antonio Vieiro <antonio@vieiro.net> Date: 2017-10-07T17:26:43Z [NETBEANS-54] Module Review lexer.nbbridge - No external libraries. - One test failed: org.netbeans.modules.lexer.nbbridge.test.MimeLookupLanguageProv - Added license to a single layer.xml test file (not strictly required). ----
          278. GitHub user vieiro opened a pull request: https://github.com/apache/incubator-netbeans/pull/80 [NETBEANS-54] Module Review libs.antlr3.runtime * Updated external/binaries-list with Maven coordinates for antlr3 runtime (BSD) * No other problems found. You can merge this pull request into a Git repository by running: $ git pull https://github.com/vieiro/incubator-netbeans netbeans-54-module-review-libs.antlr3.runtime Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/80.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #80 ---- commit 952e344be1e7ecd08ae4b73bf6ea48ef536dfc91 Author: Antonio Vieiro <antonio@vieiro.net> Date: 2017-10-07T18:35:20Z [NETBEANS-54] Module Review libs.antlr3.runtime * Updated external/binaries-list with Maven coordinates for antlr3 runtime (BSD) * No other problems found. ----
          279. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/80
          280. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/79
          281. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/66
          282. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/64
          283. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/56
          284. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/55
          285. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/53 Could you please revisit the "some text xml files without header". If possible I'd add a license header, if not, I'd add an exclude to build.xml.
          286. Github user ikysil commented on the issue: https://github.com/apache/incubator-netbeans/pull/62 It looks like this particular pull request is broken beyond reasonable repair due to mistakes which I did during synchronization with upstream. I will open a new PR.
          287. Github user ikysil closed the pull request at: https://github.com/apache/incubator-netbeans/pull/62
          288. GitHub user vieiro opened a pull request: https://github.com/apache/incubator-netbeans/pull/81 [NETBEANS-54] Module Review libs.antlr4.runtime - Updated maven coordinates for antlr 4.5.3 (BSD) - No other problems found. You can merge this pull request into a Git repository by running: $ git pull https://github.com/vieiro/incubator-netbeans netbeans-54-module-review-libs.antlr4.runtime Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/81.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #81 ---- commit 5903f671cf63382e329a74940e5230fbbc13417a Author: Antonio Vieiro <antonio@vieiro.net> Date: 2017-10-07T19:43:14Z [NETBEANS-54] Module Review libs.antlr4.runtime - Updated maven coordinates for antlr 4.5.3 (BSD) - No other problems found. ----
          289. GitHub user ikysil opened a pull request: https://github.com/apache/incubator-netbeans/pull/82 [NETBEANS-54] Module Review hibernate - external binary contains DTDs for Hibernate 3.0 configuration files - changed license headers for files reported by Rat - replacing the bundled binary is tracked by https://issues.apache.org/jira/browse/NETBEANS-79 You can merge this pull request into a Git repository by running: $ git pull https://github.com/ikysil/incubator-netbeans netbeans-54-review-hibernate-rework Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/82.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #82 ---- commit 0a5a1a61c9bad9dae96908f9b3fd63c3d3d5099d Author: Illya Kysil <ikysil@ikysil.name> Date: 2017-10-04T19:48:37Z [NETBEANS-54] Module Review hibernate - external binary contains DTDs for Hibernate 3.0 configuration files - changed license headers for files reported by Rat - replacing the bundled binary is tracked by https://issues.apache.org/jira/browse/NETBEANS-79 ----
          290. Github user junichi11 commented on the issue: https://github.com/apache/incubator-netbeans/pull/74 Yes, probably, "#" signs are not needed. I used them because I thought that the format should be unified. It is already used in o.n.swing.tabcontrol/readme.txt[1]. [1] https://github.com/apache/incubator-netbeans/blob/master/o.n.swing.tabcontrol/readme.txt
          291. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/63
          292. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/67
          293. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/68
          294. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/74
          295. GitHub user geertjanw opened a pull request: https://github.com/apache/incubator-netbeans/pull/84 [NETBEANS-54] Module Review core.kit You can merge this pull request into a Git repository by running: $ git pull https://github.com/geertjanw/incubator-netbeans netbeans-54-review-core.kit Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/84.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #84 ---- commit 927d62a0538a0796230168f1956ac06e2023dca2 Author: geertjan <geertjan.wielenga@oracle.com> Date: 2017-10-08T05:55:54Z [NETBEANS-54] Module Review core.kit ----
          296. GitHub user vieiro opened a pull request: https://github.com/apache/incubator-netbeans/pull/85 [NETBEANS-54] Module Review libs.commons_compress - Updated maven coordinates for commons/compress 1.8.1 (Apache 2) You can merge this pull request into a Git repository by running: $ git pull https://github.com/vieiro/incubator-netbeans netbeans-54-module-review-libs.commons_compress Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/85.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #85 ---- commit d6d0166dba0a420dbcd4676dd6cfa3be9f0117b9 Author: Antonio Vieiro <antonio@vieiro.net> Date: 2017-10-08T06:04:00Z [NETBEANS-54] Module Review libs.commons_compress - Updated maven coordinates for commons/compress 1.8.1 (Apache 2) ----
          297. GitHub user geertjanw opened a pull request: https://github.com/apache/incubator-netbeans/pull/86 [NETBEANS-54] Module Review core.multiview You can merge this pull request into a Git repository by running: $ git pull https://github.com/geertjanw/incubator-netbeans netbeans-54-core.multiview Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/86.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #86 ---- commit 2acf5099f2ebadfd6c8abdf3ffc380cccd7878e5 Author: geertjan <geertjan.wielenga@oracle.com> Date: 2017-10-08T06:07:11Z [NETBEANS-54] Module Review core.multiview ----
          298. GitHub user vieiro opened a pull request: https://github.com/apache/incubator-netbeans/pull/87 [NETBEANS-54] Module Review libs.commons_net - Updated maven coordinates for commons/net 3.6 (Apache 2) You can merge this pull request into a Git repository by running: $ git pull https://github.com/vieiro/incubator-netbeans netbeans-54-module-review-libs.commons_net Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/87.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #87 ---- commit 4bab223b96db762abdfc87af710552eaf34628bb Author: Antonio Vieiro <antonio@vieiro.net> Date: 2017-10-08T06:06:54Z [NETBEANS-54] Module Review libs.commons_net - Updated maven coordinates for commons/net 3.6 (Apache 2) ----
          299. GitHub user geertjanw opened a pull request: https://github.com/apache/incubator-netbeans/pull/88 [NETBEANS-54] Module Review core.output2 You can merge this pull request into a Git repository by running: $ git pull https://github.com/geertjanw/incubator-netbeans netbeans-54-review-core.output2 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/88.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #88 ---- commit d9189946a8dc34d261cb3b72144b762bd07119ba Author: geertjan <geertjan.wielenga@oracle.com> Date: 2017-10-08T06:19:43Z [NETBEANS-54] Module Review core.output2 ----
          300. GitHub user geertjanw opened a pull request: https://github.com/apache/incubator-netbeans/pull/89 [NETBEANS-54] Module Review core.startup You can merge this pull request into a Git repository by running: $ git pull https://github.com/geertjanw/incubator-netbeans netbeans-54-review-core.startup Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/89.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #89 ---- commit fa16f25fe186e4bf230801b7298a0cfd06866ccb Author: geertjan <geertjan.wielenga@oracle.com> Date: 2017-10-08T06:28:04Z [NETBEANS-54] Module Review core.startup ----
          301. GitHub user geertjanw opened a pull request: https://github.com/apache/incubator-netbeans/pull/90 [NETBEANS-54] Module Review core.ui You can merge this pull request into a Git repository by running: $ git pull https://github.com/geertjanw/incubator-netbeans netbeans-54-review-core.ui Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/90.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #90 ---- commit 9da052165fd0c7d884a67b8f6661147628c9a2b3 Author: geertjan <geertjan.wielenga@oracle.com> Date: 2017-10-08T06:35:05Z [NETBEANS-54] Module Review core.ui ----
          302. GitHub user vieiro opened a pull request: https://github.com/apache/incubator-netbeans/pull/91 [NETBEANS-54] Module Review libs.freemarker - Added maven coordinates to external/binaries_list for freemarker 2.3.19 (BSD 3?) - Added headers to two source files (FreemarkerEngine.java & FreemarkerFactory.java) and to one test file. - All unit tests passing. - Not adding license headers to the following test files (as some tests would fail): - ./test/unit/data/golden/GeneratedMethodBody.java - ./test/unit/data/golden/ClassWithoutReplacements.java - ./test/unit/data/golden/GeneratedMethodBody2.java - ./test/unit/data/golden/ForceNoReplacements.java - ./test/unit/data/golden/SimpleReplacements.java - ./test/unit/data/licenseheader.txt - ./test/unit/data/templates/GeneratedMethodBody.java - ./test/unit/data/templates/ClassWithoutReplacements.java - ./test/unit/data/templates/SimpleReplacements.java You can merge this pull request into a Git repository by running: $ git pull https://github.com/vieiro/incubator-netbeans netbeans-54-module-review-libs.freemarker Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/91.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #91 ---- commit ed9232dc8a05aa17123914fcb550efa72eefa2d9 Author: Antonio Vieiro <antonio@vieiro.net> Date: 2017-10-08T06:33:35Z [NETBEANS-54] Module Review libs.freemarker - Added maven coordinates to external/binaries_list for freemarker 2.3.19 (BSD 3?) - Added headers to two source files (FreemarkerEngine.java & FreemarkerFactory.java) and to one test file. - All unit tests passing. - Not adding license headers to the following test files (as some tests would fail): - ./test/unit/data/golden/GeneratedMethodBody.java - ./test/unit/data/golden/ClassWithoutReplacements.java - ./test/unit/data/golden/GeneratedMethodBody2.java - ./test/unit/data/golden/ForceNoReplacements.java - ./test/unit/data/golden/SimpleReplacements.java - ./test/unit/data/licenseheader.txt - ./test/unit/data/templates/GeneratedMethodBody.java - ./test/unit/data/templates/ClassWithoutReplacements.java - ./test/unit/data/templates/SimpleReplacements.java ----
          303. GitHub user geertjanw opened a pull request: https://github.com/apache/incubator-netbeans/pull/92 [NETBEANS-54] Module Review core.windows You can merge this pull request into a Git repository by running: $ git pull https://github.com/geertjanw/incubator-netbeans netbeans-54-review-core.windows Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/92.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #92 ---- commit a0c5e285d687f5cec04af5861ed30901eb4747c6 Author: geertjan <geertjan.wielenga@oracle.com> Date: 2017-10-08T06:45:41Z [NETBEANS-54] Module Review core.windows ----
          304. GitHub user geertjanw opened a pull request: https://github.com/apache/incubator-netbeans/pull/93 [NETBEANS-54] Module Review core.io.ui You can merge this pull request into a Git repository by running: $ git pull https://github.com/geertjanw/incubator-netbeans netbeans-54-review-core.io.ui Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/93.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #93 ---- commit b93bb1879db6c914215170ced749a25796e06ae1 Author: geertjan <geertjan.wielenga@oracle.com> Date: 2017-10-08T06:50:45Z [NETBEANS-54] Module Review core.io.ui ----
          305. GitHub user vieiro opened a pull request: https://github.com/apache/incubator-netbeans/pull/94 [NETBEANS-54] Module Review libs.ini4j - Updated maven coordinates for ini4j 0.5.1 (Apache 2) - All license headers are correct. You can merge this pull request into a Git repository by running: $ git pull https://github.com/vieiro/incubator-netbeans netbeans-54-module-review-libs.ini4j Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/94.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #94 ---- commit 049f9659e27cc03668a116486168f15caaafcd56 Author: Antonio Vieiro <antonio@vieiro.net> Date: 2017-10-08T07:04:10Z [NETBEANS-54] Module Review libs.ini4j - Updated maven coordinates for ini4j 0.5.1 (Apache 2) - All license headers are correct. ----
          306. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/52 Thank you for looking into this. I disagree with your assessment about the license header for the templates. I draw the line between the template and its result. The template itself is ALv2 licensed, but its intention is to create code and that is not covered by the ALv2 license. So the license header belongs into the template if it does not interfere with the generation process and in the cases of the XML templates all templates were freemarker templates, so the ALv2 header I added is only in the template itself, not in the resulting code. In fact the license for the resulting code comes from the project properties.
          307. GitHub user geertjanw opened a pull request: https://github.com/apache/incubator-netbeans/pull/95 [NETBEANS-54] Module Review apisupport.ant You can merge this pull request into a Git repository by running: $ git pull https://github.com/geertjanw/incubator-netbeans netbeans-54-review-apisupport.ant Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/95.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #95 ---- commit 06da98868310183b783644233c213a2349d689fe Author: geertjan <geertjan.wielenga@oracle.com> Date: 2017-10-08T09:18:22Z [NETBEANS-54] Module Review apisupport.ant ----
          308. Github user emilianbold commented on the issue: https://github.com/apache/incubator-netbeans/pull/95 Arent't lots of these "Problems to be solved centrally"?
          309. Github user emilianbold commented on the issue: https://github.com/apache/incubator-netbeans/pull/52 > I disagree with your assessment about the license header for the templates. I draw the line between the template and its result. I believe we should discuss this on the dev@ mailing lists. Personally I see it as a bad move to scare users that generated code might be Apache-licensed.
          310. Github user geertjanw commented on the issue: https://github.com/apache/incubator-netbeans/pull/95 Yes, though did them just to get it done.
          311. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/53
          312. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/53 Merged - thank you!
          313. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/81
          314. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/83
          315. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/83 Merged the change - could you please open a jira issue for handling this library? As it is LGPL it can't be distributed with the Apache Netbeans source and either installed by the user or replaced.
          316. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/85 Please have a look at for ALv2 licensed files and their NOTICE file (commons-compress has one): http://mail-archives.apache.org/mod_mbox/incubator-netbeans-dev/201710.mbox/%3cCALd=3dEZDmMVwpYajqcmNVSrfa5w_xKAzpGv56unHnAfMQacjg@mail.gmail.com%3e If I'm not mistaken all apache project carry a notice file, so that needs to be included.
          317. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/87 Please have a look at for ALv2 licensed files and their NOTICE file (commons-compress has one): http://mail-archives.apache.org/mod_mbox/incubator-netbeans-dev/201710.mbox/%3cCALd=3dEZDmMVwpYajqcmNVSrfa5w_xKAzpGv56unHnAfMQacjg@mail.gmail.com%3e If I'm not mistaken all apache project carry a notice file, so that needs to be included.
          318. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/94
          319. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/5
          320. GitHub user juneau001 opened a pull request: https://github.com/apache/incubator-netbeans/pull/98 [NETBEANS-54] Module Review j2ee.metadata - no external libraries - checked Rat report, added license header on apichanges.xml and changed header on /test/unit/data/projects/JavaApplication1/nbproject/project.xml from Oracle to Apache, others looked ok. Ignored problems to be resolved centrally. - skimmed module and did not see any other issues You can merge this pull request into a Git repository by running: $ git pull https://github.com/juneau001/incubator-netbeans master Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/98.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #98 ---- commit 7935ee11d1cfdb2efd3fefd72a63089455c6127c Author: Josh Juneau <juneau001@gmail.com> Date: 2017-10-08T14:54:01Z [NETBEANS-54] Module Review j2ee.metadata ----
          321. Github user matthiasblaesing commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/91#discussion_r143356883 --- Diff: libs.freemarker/external/binaries-list --- @@ -14,4 +14,4 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80 freemarker-2.3.19.jar +A251045E5FADD02824D17F1AA8C412ACCF1AA1C9 org.freemarker:freemarker:2.3.19 --- End diff -- This is in the license: > 2. The end-user documentation included with the redistribution, if any, must > include the following acknowlegement: > "This product includes software developed by the > Visigoth Software Society (http://www.visigoths.org/)." > Alternately, this acknowlegement may appear in the software itself, if and > wherever such third-party acknowlegements normally appear. I would this include a "-notice" file, that in the end should end up in the apache NOTICE file. From my reading this is similar to the apache NOTICE file, that needs to be redistributed.
          322. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/84
          323. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/86
          324. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/88
          325. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/89
          326. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/90
          327. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/92
          328. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/93
          329. GitHub user jlahoda opened a pull request: https://github.com/apache/incubator-netbeans/pull/99 [NETBEANS-54] Module Review applemenu -using an external library instead of inline com/apple/eawt classes -saner handling of "external" java.awt classes (not unpacking them into the source directory) You can merge this pull request into a Git repository by running: $ git pull https://github.com/jlahoda/incubator-netbeans applemenu-review Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/99.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #99 ---- commit 898a030c44e6002a4861ea409e32fc63d6d5a4a6 Author: Jan Lahoda <jlahoda@netbeans.org> Date: 2017-10-08T15:36:00Z [NETBEANS-54] Module Review applemenu -using an external library instead of inline com/apple/eawt classes -saner handling of "external" java.awt classes (not unpacking them into the source directory) ----
          330. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/82 Merged - thank you!
          331. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/82
          332. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/98
          333. Github user emilianbold commented on the issue: https://github.com/apache/incubator-netbeans/pull/95 > Yes, though did them just to get it done. But if the conclusion is that these should *not* have headers, we'll have to go back and delete them.
          334. Github user geertjanw commented on the issue: https://github.com/apache/incubator-netbeans/pull/95 OK, we should decide on that first and until then not merge this PR.
          335. Github user matthiasblaesing commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/91#discussion_r143360229 --- Diff: libs.freemarker/external/freemarker-2.3.19-notice.txt --- @@ -1,6 +1,35 @@ -Apache FreeMarker (incubating) -Copyright 2015-2017 The Apache Software Foundation +Copyright (c) 2003 The Visigoth Software Society. All rights reserved. -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + --- End diff -- I would not go for the full license in the notice. I would just add the required part (see section 2 of the license): > This product includes software developed by the > Visigoth Software Society (http://www.visigoths.org/). For updates please also squash the changes together - there will now be at least four changeset for more or less one change.
          336. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/85
          337. Github user geertjanw commented on the issue: https://github.com/apache/incubator-netbeans/pull/99 Wow, excellent, thanks, that helps a lot.
          338. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/87
          339. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/95 The situation is already there. With or without Geertjans work a potential automatic system needs to detect present licenses, and if it decided, that the headers are not needed, they are not wrong either (Asuming they don't break tests/functionality). I don't see why we would rip out license headers, that are correct and don't interfere with functions/tests.
          340. GitHub user vieiro opened a pull request: https://github.com/apache/incubator-netbeans/pull/100 [NETBEANS-54] Module Review languages.yaml - No external libraries. - Added license to l10n.list - Two user-facing small templates without a license. - 94 unit test files without license. As this module is a parser/lexer/scanner for yaml files I think it's safer not to modify these files with license headers. You can merge this pull request into a Git repository by running: $ git pull https://github.com/vieiro/incubator-netbeans netbeans-54-module-review-languages.yaml Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/100.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #100 ---- commit d37639b01cdd364c4b725129a820bdca5c45d24f Author: Antonio Vieiro <antonio@vieiro.net> Date: 2017-10-08T17:18:58Z [NETBEANS-54] Module Review languages.yaml - No external libraries. - Added license to l10n.list - Two user-facing small templates without a license. - 94 unit test files without license. As this module is a parser/lexer/scanner for yaml files I think it's safer not to modify these files with license headers. ----
          341. GitHub user vieiro opened a pull request: https://github.com/apache/incubator-netbeans/pull/101 [NETBEANS-54] Module Review libs.jsch.agentproxy - Updated external/binaries-list with maven coordinates. - Added 4 notice.txt files. - The rest of the files have proper Apache licenses. You can merge this pull request into a Git repository by running: $ git pull https://github.com/vieiro/incubator-netbeans netbeans-54-module-review-libs.jsch.agentproxy Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/101.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #101 ---- commit b20dfcb99c30ea21db62acdf5fb4159a667346d6 Author: Antonio Vieiro <antonio@vieiro.net> Date: 2017-10-08T17:42:57Z [NETBEANS-54] Module Review libs.jsch.agentproxy - Updated external/binaries-list with maven coordinates. - Added 4 notice.txt files. - The rest of the files have proper Apache licenses. ----
          342. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/91
          343. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/91 Thank you - I squashed your changes together and added an exclusion in the rat report for the test-data.
          344. Github user vieiro commented on the issue: https://github.com/apache/incubator-netbeans/pull/91 Thank you, I'll try to add those test files to the exclusion list myself in future PRs.
          345. Github user geertjanw commented on the issue: https://github.com/apache/incubator-netbeans/pull/95 Agree with this, i.e., whether we decide to add them for all of these throughout or not, the fact that these specific ones in this module already have them, now that I've added them manually, shouldn't be a problem and we should merge this PR from my point of view.
          346. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/101
          347. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/95 @geertjanw please close this PR, the changeset was also part of #96 and the changes are thus merged already.
          348. Github user geertjanw commented on the issue: https://github.com/apache/incubator-netbeans/pull/95 OK.
          349. Github user geertjanw closed the pull request at: https://github.com/apache/incubator-netbeans/pull/95
          350. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/99 I agree - this looks good. I don't own a mac, so it would be good if someone with a mac could give it a spin.
          351. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/100 I merged this in a858f131260db819b3c6106d7d97f28bc61fe26d and added 73b9472ea4174da890b03465ed727ac876bc1686 exclusions. Please close this PR.
          352. Github user jlahoda commented on the issue: https://github.com/apache/incubator-netbeans/pull/99 I've originally forgot to cleanup the build.xml. I've updated the pull request with the cleanup now.
          353. Github user vieiro closed the pull request at: https://github.com/apache/incubator-netbeans/pull/100
          354. Github user vieiro commented on the issue: https://github.com/apache/incubator-netbeans/pull/100 Thanks!
          355. GitHub user geertjanw opened a pull request: https://github.com/apache/incubator-netbeans/pull/102 [NETBEANS-54] Module Review libs.asm You can merge this pull request into a Git repository by running: $ git pull https://github.com/geertjanw/incubator-netbeans netbeans-54-review-libs.asm Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/102.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #102 ---- commit 5f0fabf6de5544decae5e166d48b6116a365fdf6 Author: geertjan <geertjan.wielenga@oracle.com> Date: 2017-10-08T20:30:45Z [NETBEANS-54] Module Review libs.asm ----
          356. GitHub user geertjanw opened a pull request: https://github.com/apache/incubator-netbeans/pull/103 [NETBEANS-54] Module Review libs.junit4 You can merge this pull request into a Git repository by running: $ git pull https://github.com/geertjanw/incubator-netbeans netbeans-54-review-libs.junit4 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/103.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #103 ---- commit ed4c03cb13928b6a076f4eac2730704ae2f66a82 Author: geertjan <geertjan.wielenga@oracle.com> Date: 2017-10-08T20:52:14Z [NETBEANS-54] Module Review libs.junit4 ----
          357. GitHub user geertjanw opened a pull request: https://github.com/apache/incubator-netbeans/pull/104 [NETBEANS-54] Module Review libs.osgi You can merge this pull request into a Git repository by running: $ git pull https://github.com/geertjanw/incubator-netbeans netbeans-54-review-libs.osgi Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/104.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #104 ---- commit 96c48b315a585197672e5a0975cedfa1a2b30438 Author: geertjan <geertjan.wielenga@oracle.com> Date: 2017-10-08T21:17:22Z [NETBEANS-54] Module Review libs.osgi ----
          358. GitHub user martypowell opened a pull request: https://github.com/apache/incubator-netbeans/pull/105 [NETBEANS-54] Module Review - Resolves #65 - html.editor.lib Replaces license header with apache standard. If there is a problem with the formatting changes caused by my text editor let me know and I can adjust any of those files. You can merge this pull request into a Git repository by running: $ git pull https://github.com/martypowell/incubator-netbeans master Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/105.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #105 ---- commit 75d1302d001c53d87850e217189f53a55759c976 Author: Marty Powell <jpowel25@gmail.com> Date: 2017-10-08T21:52:35Z Updated the license header to the standard Apache Software Foundation license header commit 2059a010fc2d2813dd6bdb55c2f85f0ec250e0ca Author: Marty Powell <jpowel25@gmail.com> Date: 2017-10-08T22:12:03Z roll back because formatting didn't match original commit 10786bc230dcad774a3e0acf3f5c4b96e9b06c33 Author: Marty Powell <jpowel25@gmail.com> Date: 2017-10-08T22:18:17Z removed whitespace ----
          359. Github user junichi11 commented on the issue: https://github.com/apache/incubator-netbeans/pull/105 @martypowell If you come from @emilianbold 's repo (https://github.com/emilianbold/incubator-netbeans), please send your PR there. i.e. not `apache:master` but `emilianbold:master`
          360. Github user martypowell commented on the issue: https://github.com/apache/incubator-netbeans/pull/105 @junichi11 thanks wasn't paying attention...will do
          361. Github user martypowell closed the pull request at: https://github.com/apache/incubator-netbeans/pull/105
          362. GitHub user juneau001 opened a pull request: https://github.com/apache/incubator-netbeans/pull/110 [NETBEANS-54] Module Review j2ee.metadata.model.support - no external libraries - checked Rat report, added license header on Table.javax which unfortunately also changed whitespace...hope is okay, other files looked ok. Ignored problems to be resolved centrally. - skimmed module and did not see any other issues You can merge this pull request into a Git repository by running: $ git pull https://github.com/juneau001/incubator-netbeans master Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/110.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #110 ---- commit 2a5f1c8c7ef37cf8116d0ddf685add294baaa69c Author: Josh Juneau <juneau001@gmail.com> Date: 2017-10-09T14:17:37Z [NETBEANS-54] Module Review j2ee.metadata.model.support ----
          363. Github user matthiasblaesing commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/104#discussion_r143545978 --- Diff: libs.osgi/external/binaries-list --- @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD osgi.cmpn-4.2.jar -2F2FBFF3FB80F91B159A7FA9F0C42A894BB8BCC5 osgi.core-5.0.0.jar +972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD org.netbeans.external:osgi.cmpn:4.2 --- End diff -- How does this work? I don't see this on maven central. There are osgi.cmpn artifacts in the org.osgi group, just different versions. I would use this opportunity to move to the "primary" ones.
          364. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/103
          365. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/102
          366. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/110
          367. GitHub user vieiro opened a pull request: https://github.com/apache/incubator-netbeans/pull/112 [NETBEANS-54] Module Review libs.lucene - Added lucene notice file from https://github.com/apache/lucene-solr/blob/releases/lucene-solr/3.5.0/lucene/NOTICE.txt - Added the maven coordinates. - No other issues found. You can merge this pull request into a Git repository by running: $ git pull https://github.com/vieiro/incubator-netbeans netbeans-54-module-review-libs.lucene Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/112.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #112 ---- ----
          368. Github user junichi11 commented on the issue: https://github.com/apache/incubator-netbeans/pull/73 @varaghar If you come from @emilianbold 's repo (https://github.com/emilianbold/incubator-netbeans), please send your PR there. i.e. not `apache:master` but `emilianbold:master`.
          369. GitHub user vieiro opened a pull request: https://github.com/apache/incubator-netbeans/pull/113 [NETBEANS-54] Module Review libs.xerces - Updated maven coordinates for Xerces 2.8.0 (Apache 2). - Added xerces notice from https://svn.apache.org/repos/asf/xerces/java/tags/Xerces-J_2_8_0/NOTICE You can merge this pull request into a Git repository by running: $ git pull https://github.com/vieiro/incubator-netbeans netbeans-54-module-review-libs.xerces Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/113.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #113 ---- commit 3a9f767d933afd9333de3f08f45cb56579efad95 Author: Antonio Vieiro <antonio@vieiro.net> Date: 2017-10-10T05:52:55Z [NETBEANS-54] Module Review libs.xerces - Updated maven coordinates for Xerces 2.8.0 (Apache 2). - Added xerces notice from https://svn.apache.org/repos/asf/xerces/java/tags/Xerces-J_2_8_0/NOTICE ----
          370. GitHub user rosslamont opened a pull request: https://github.com/apache/incubator-netbeans/pull/114 [NETBEANS-54] Module Review css.lib Added or replaced licenses: - CssTokenId.java - NoteType.java - TokenAcceptorsTest.java - itabbar.css.testfile - all css files in unit tests Still todo: - antlrv4.patch (not sure what to do here) - .txt data files (central solution) You can merge this pull request into a Git repository by running: $ git pull https://github.com/rosslamont/incubator-netbeans css_lib Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/114.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #114 ---- commit c5ba6292be750b3d2c5c771d8c38802324698784 Author: Ross Lamont <rlamont@componentcorp.com> Date: 2017-10-10T11:19:51Z [NETBEANS-54] Module Review css.lib Added or replaced licenses: - CssTokenId.java - NoteType.java - TokenAcceptorsTest.java - itabbar.css.testfile - all css files in unit tests Still todo: - antlrv4.patch - .txt data files (central solution) ----
          371. Github user geertjanw commented on the issue: https://github.com/apache/incubator-netbeans/pull/114 Looks great and makes sense not to do anything with that patch and .txt data file. Thanks for this review, great.
          372. Github user vieiro commented on the issue: https://github.com/apache/incubator-netbeans/pull/83 Just for the records, the issue is https://issues.apache.org/jira/browse/NETBEANS-81
          373. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/113 Please recheck this as this breaks the build. My local build breaks different than the protocol from travis, but reproducible. To check yourself, please run in the repository: ``` git clean -x -f ant ``` The git clean part removes all files, that are not part of the repository. The downloaded file gets a different name and is can't be made available at build and compile time. Hava a look at project.properties - this should do it: ```diff # This patch file was generated by NetBeans IDE # It uses platform neutral UTF-8 encoding and \n newlines. --- a/libs.xerces/nbproject/project.properties +++ b/libs.xerces/nbproject/project.properties @@ -16,6 +16,6 @@ # under the License. is.autoload=true -release.external/xerces-2.8.0.jar=modules/ext/xerces-2.8.0.jar +release.external/xercesImpl-2.8.0.jar=modules/ext/xerces-2.8.0.jar module.jar.verifylinkageignores=org.apache.xerces.util.XMLCatalogResolver spec.version.base=1.39.0 ```
          374. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/114 Sorry, but this breaks the unittests. In these the CSS structure is parsed and the result is compared with a reference file. I would do this: - revert the changes to the files under `css.lib/test/unit/data` - add an exclusion pattern to the rat report task in the `nbbuild/build.xml` with the pattern `css.lib/test/unit/data/**` with a comment, that these are testdata files It would be nice if you could have another look at this.
          375. Github user vieiro commented on the issue: https://github.com/apache/incubator-netbeans/pull/113 Should be ready now. Sorry for the trouble. It would be nice getting a travis warning in case of build failure.
          376. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/112
          377. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/52 @emilianbold @junichi11 given that the html module has a GPLv2/wCPE+CDDL license http://mail-archives.apache.org/mod_mbox/incubator-netbeans-dev/201710.mbox/%3CCAEF8jVfgnfUVAzntSRDYE%2BST%3DwreSced3xJ%2BChBOkdX51ExZJw%40mail.gmail.com%3E does this fix the issues you have with this?
          378. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/113 Your wish was already granted - the travis configuration was added to the repository literally hours ago. That's the reason I saw that. :-)
          379. GitHub user vieiro opened a pull request: https://github.com/apache/incubator-netbeans/pull/115 [NETBEANS-54] Module Review libs.jvyamlb - Version 0.2.7 is not available in maven.central - Downgraded to 0.2.6 to see how it behaves in travis build - See issue #82 https://issues.apache.org/jira/browse/NETBEANS-82 You can merge this pull request into a Git repository by running: $ git pull https://github.com/vieiro/incubator-netbeans netbeans-54-module-review-libs.jvyamlb Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/115.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #115 ---- commit 79d0b48ad1ce0d9bfa7086612bf85b5ed9c6fa21 Author: Antonio Vieiro <antonio@vieiro.net> Date: 2017-10-10T20:23:35Z [NETBEANS-54] Module Review libs.jvyamlb - Version 0.2.7 is not available in maven.central - Downgraded to 0.2.6 to see how it behaves in travis build - See issue #82 https://issues.apache.org/jira/browse/NETBEANS-82 ----
          380. Github user vieiro commented on the issue: https://github.com/apache/incubator-netbeans/pull/113 It would be nice getting a pair of beers in case of build success! :-D
          381. Github user emilianbold commented on the issue: https://github.com/apache/incubator-netbeans/pull/52 @matthiasblaesing: so far I have been excluding template files from Rat. They are user visible as far as I can tell and I don't believe it's good for NetBeans to have that. Maybe there is some flag or something in the non-dev builds that hide the licese... I have yet to see the license header disappear when shown.
          382. Github user rosslamont commented on the issue: https://github.com/apache/incubator-netbeans/pull/114 My apologies, I assumed tests were part of the default build. Curious: shouldn't travis be running unit tests and picking that up? I will revert the test changes and look into the rat exclusion.
          383. GitHub user vieiro opened a pull request: https://github.com/apache/incubator-netbeans/pull/116 [NETBEANS-54] Module Review libs.smack - Updated maven coordinates. - Passing tests. No license headers missing. - Still awaiting for travis beers. You can merge this pull request into a Git repository by running: $ git pull https://github.com/vieiro/incubator-netbeans netbeans-54-module-review-libs.smack Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/116.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #116 ---- commit 9c7f5bafca84797ae4bc625bf8670ff46e942a3f Author: Antonio Vieiro <antonio@vieiro.net> Date: 2017-10-10T21:13:30Z [NETBEANS-54] Module Review libs.smack - Updated maven coordinates. - Passing tests. No license headers missing. - Still awaiting for travis beers. ----
          384. Github user vieiro commented on the issue: https://github.com/apache/incubator-netbeans/pull/116 Note: This project (Apache license) didn't seem to have any notice file.
          385. Github user rosslamont commented on the issue: https://github.com/apache/incubator-netbeans/pull/114 Done.
          386. Github user rosslamont commented on the issue: https://github.com/apache/incubator-netbeans/pull/114 Sorry - should I also add the patch to the rat exclusions? What would the comment be?
          387. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/52 I get the feeling, that we are running in circles: - Junichi established, that there are templates that already today carry a license header (just the wrong one) (In the IDE Tools -> Templates -> Other -> html, verified in 8.2) - I'm only talking about freemarker templates, that offer the option to add a comment header, that does not go into the resulting file (again, try with the html template, you end up with a file without the GPL+CDDL header). Plaintext templates, that are copied verbatim or just allow text replacement won't be touched by me. - If a developer looks at the templates he should already now that netbeans is ALv2 licensed, else she/he is not even allowed to have it (at least for Germany no right are granted to third parties by default, so if you assume I gave you no license, you are plainly not allowed to use it) - Having headers makes license review easier - Apart from a feeling no argument was raised against adding the license header, in fact for developers it might be good to get into the habit to "survive" seeing a license.
          388. Github user dschoorl commented on the issue: https://github.com/apache/incubator-netbeans/pull/7 I added notice file for jcip-annotations instead of a jcip-license file. I changed the jsr305 license file based on the info in http://wiki.netbeans.org/DevFaqExternalLibraries as pointed out by Jan. Unfortunately, the checksum of the artifact at the maven coordinates differs from the original download. The META-INF says it's build with a different JRE version. I have not thoroughly checked the contents of the maven download.
          389. Github user emilianbold commented on the issue: https://github.com/apache/incubator-netbeans/pull/52 I really believe this should be discussed on dev@. There are two email threads, one started by me and one by @junichi11 for mentors (which haven't replied). We are not running in circles, you just want license headers everywhere! There are various types of 'templates': 1. example text displayed to users as preview in Options window and elsewhere 2. freemarker templates used internally and 3. freemarker templates the user is also able to see and edit (eg. Open in Editor for Tools | Templates). The general direction I am using is simple: * if a file has the Oracle template I will replace it, regardless. We'll think of the user-facing impact later. * for templates without an existing Oracle license header, I will not add a license header but exclude it from Rat. The only exception where I would add the license header is category 2 where it is clear the end user does not get to see or edit the template. But we have to prove this for each individual file and it's not really worth the trouble because these templates are simple (not much Intelectual Property, really) and the lack of a license header does not imply Public Domain anyhow (the whole of NetBeans does have a license). I don't think it's up to us to teach developers copyright and patent law. A lot of developers are really clueless about the legal ramifications and they will dislike a lot seeing Apache license headers in "their" code generation pipeline (because, aren't they creating derivative works? Actually, they are!). By the time you have them thinking about this (or, maybe even, ask their own legal counsel) you have already lost a customer.
          390. GitHub user juneau001 opened a pull request: https://github.com/apache/incubator-netbeans/pull/117 [NETBEANS-54] Modeule Review j2ee.persistence - JPA external library (Java EE) is used for test entity classes, along with junit - checked Rat report: everything has been relicensed to Apache, included in 'central problems' list above, or excluded via Rat. Did not touch the .pass test files. - skimmed through module, did not notice additional problems You can merge this pull request into a Git repository by running: $ git pull https://github.com/juneau001/incubator-netbeans master Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/117.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #117 ---- commit 1d886fda778315e4c6089ab6c7e5a0d9916f571d Author: Josh Juneau <juneau001@gmail.com> Date: 2017-10-11T03:54:37Z [NETBEANS-54] Modeule Review j2ee.persistence ----
          391. Github user vieiro commented on the issue: https://github.com/apache/incubator-netbeans/pull/116 So we have a "/home/travis/build/apache/incubator-netbeans/nbbuild/templates/projectized.xml:225: Could not find file /home/travis/build/apache/incubator-netbeans/libs.smack/external/smack.jar to copy " I'll take a look at this later on.
          392. GitHub user mcdonnell-john opened a pull request: https://github.com/apache/incubator-netbeans/pull/118 [NETBEANS-54] Module Review o.eclipse.jgit Had to change from using a jar called: org.eclipse.jgit-3.6.2.201501210735-r-nosignature.jar to org.eclipse.jgit-3.6.2.201501210735-r.jar Since the previous one wasnt in maven. NO NOTICE file added - Not sure it needs one since its under EDL - see https://github.com/eclipse/jgit/tree/v3.6.2.201501210735-r You can merge this pull request into a Git repository by running: $ git pull https://github.com/mcdonnell-john/incubator-netbeans feature/NETBEANS-54/o.eclipse.jgit Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/118.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #118 ---- commit 0f0a0a51866412902354c2f0d814f318719e235b Author: John McDonnell <john.mcdonnell@bearingpoint.com> Date: 2017-10-11T07:01:23Z [NETBEANS-54] Updated binaries to use maven lookups - Had to change from using a jar called: org.eclipse.jgit-3.6.2.201501210735-r-nosignature.jar to org.eclipse.jgit-3.6.2.201501210735-r.jar Since the previous one wasnt in maven. NO NOTICE file added - Not sure it needs one since its under EDL - see https://github.com/eclipse/jgit/tree/v3.6.2.201501210735-r ----
          393. GitHub user mcdonnell-john opened a pull request: https://github.com/apache/incubator-netbeans/pull/119 [NETBEANS-54] Module Review org.eclipse.jgit.java7 Had to change from using a jar called: org.eclipse.jgit.java7-3.6.2.201501210735-r-nosignature.jar to org.eclipse.jgit.java7-3.6.2.201501210735-r.jar Since the previous one wasn't in maven. NO NOTICE file added - Not sure it needs one since its under EDL - see https://github.com/eclipse/jgit/tree/v3.6.2.201501210735-r You can merge this pull request into a Git repository by running: $ git pull https://github.com/mcdonnell-john/incubator-netbeans feature/NETBEANS-54/o.eclipse.jgit.java7 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/119.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #119 ---- commit 032e9cf8cdd05855e7db9b0fa3c6c7c877f7721b Author: John McDonnell <john.mcdonnell@bearingpoint.com> Date: 2017-10-11T10:38:07Z [NETBEANS-54] Updated binaries to use maven lookups - Had to change from using a jar called: org.eclipse.jgit.java7-3.6.2.201501210735-r-nosignature.jar to org.eclipse.jgit.java7-3.6.2.201501210735-r.jar Since the previous one wasn't in maven. NO NOTICE file added - Not sure it needs one since its under EDL - see https://github.com/eclipse/jgit/tree/v3.6.2.201501210735-r ----
          394. GitHub user geertjanw opened a pull request: https://github.com/apache/incubator-netbeans/pull/120 [NETBEANS-54] Module Review junitlib You can merge this pull request into a Git repository by running: $ git pull https://github.com/geertjanw/incubator-netbeans netbeans-54-review-junitlib Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/120.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #120 ---- commit a53719ca39589471a2e3e741cb0ce450c7dcacb4 Author: geertjan <geertjan.wielenga@oracle.com> Date: 2017-10-11T11:07:42Z [NETBEANS-54] Module Review junitlib ----
          395. GitHub user neilcsmith-net opened a pull request: https://github.com/apache/incubator-netbeans/pull/121 [NETBEANS-54] Add l10n.list to Rat excludes. Remove translation registration files from Rat report. You can merge this pull request into a Git repository by running: $ git pull https://github.com/neilcsmith-net/incubator-netbeans l10n Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/121.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #121 ---- commit ed955f906e666bdca782cb940bd414f29a516e9c Author: Neil C Smith <neilcsmith@apache.org> Date: 2017-10-11T12:45:39Z [NETBEANS-54] Add l10n.list to Rat excludes. ----
          396. GitHub user mcdonnell-john opened a pull request: https://github.com/apache/incubator-netbeans/pull/123 [NETBEANS-54] Module Review hudson.subversion You can merge this pull request into a Git repository by running: $ git pull https://github.com/mcdonnell-john/incubator-netbeans feature/NETBEANS-54/hudson.subversion Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/123.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #123 ---- commit 8ce45a620836b5ac99fb33615ff0b81c76fc3da2 Author: John McDonnell <john.mcdonnell@bearingpoint.com> Date: 2017-10-11T13:30:30Z [NETBEANS-54] Updated rat exclusions to include hudson.subversion/test/unit/src/org/netbeans/modules/hudson/subversion/sample-entries-file since this file is test data. - including a license will break tests. commit 36f5cec09fa1dfb5f4bb90f55b5bceb78798c075 Author: John McDonnell <john.mcdonnell@bearingpoint.com> Date: 2017-10-11T13:33:18Z Merge remote-tracking branch 'upstream/master' into feature/NETBEANS-54/hudson.subversion ----
          397. GitHub user mcdonnell-john opened a pull request: https://github.com/apache/incubator-netbeans/pull/124 [NETBEANS-54] Module Review o.apache.tools.ant.module You can merge this pull request into a Git repository by running: $ git pull https://github.com/mcdonnell-john/incubator-netbeans feature/NETBEANS-54/o.apache.tools.ant.module Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/124.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #124 ---- commit 72d426903eaea1bcccb961513ba87570700fa87c Author: John McDonnell <john.mcdonnell@bearingpoint.com> Date: 2017-10-11T14:09:01Z [NETBEANS-54] Added 3 patterns to the exclusion list for the Rat Report and added missing licenses to 2 files ----
          398. GitHub user mcdonnell-john opened a pull request: https://github.com/apache/incubator-netbeans/pull/125 [NETBEANS-54] Module Review javafx2.editor You can merge this pull request into a Git repository by running: $ git pull https://github.com/mcdonnell-john/incubator-netbeans feature/NETBEANS-54/javafx2.editor Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/125.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #125 ---- commit 90909e53fab2698d735d98811a69ab3d9e6c5019 Author: John McDonnell <john.mcdonnell@bearingpoint.com> Date: 2017-10-11T15:01:19Z [NETBEANS-54] Added missing license and included 2 exclusion rules for test data ----
          399. GitHub user neilcsmith-net opened a pull request: https://github.com/apache/incubator-netbeans/pull/126 [NETBEANS-54] Replace Oracle license in form module templates; add palette-item exclude Replace Oracle license in form module templates; add palette-item exclude. This doesn't complete Form module fixes - still some test projects to fix, You can merge this pull request into a Git repository by running: $ git pull https://github.com/neilcsmith-net/incubator-netbeans form Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/126.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #126 ---- commit ed9f80cece660222f4ced5e6372e55e5e43df74b Author: Neil C Smith <neilcsmith@apache.org> Date: 2017-10-11T14:50:12Z [NETBEANS-54] Add .palette_item files to Rat exclude. commit 0b37620f278fbeb95ce1b671939707c07a881dc6 Author: Neil C Smith <neilcsmith@apache.org> Date: 2017-10-11T14:51:30Z [NETBEANS-54] Replace Oracle licenses with Apache on Form template files. ----
          400. GitHub user mcdonnell-john opened a pull request: https://github.com/apache/incubator-netbeans/pull/127 [NETBEANS-54] Module Review javafx2.kit You can merge this pull request into a Git repository by running: $ git pull https://github.com/mcdonnell-john/incubator-netbeans feature/NETBEANS-54/javafx2.kit Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/127.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #127 ---- commit 19c2ecc6447f5131e89350f8a65175dac0be42d4 Author: John McDonnell <john.mcdonnell@bearingpoint.com> Date: 2017-10-11T16:33:38Z [NETBEANS-54] Added an exclusion for javafx2.kit/release/VERSION.txt to the Rat Report ----
          401. GitHub user mcdonnell-john opened a pull request: https://github.com/apache/incubator-netbeans/pull/128 [NETBEANS-54] Module Review javafx2.sample You can merge this pull request into a Git repository by running: $ git pull https://github.com/mcdonnell-john/incubator-netbeans feature/NETBEANS-54/javafx2.samples Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/128.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #128 ---- commit eec8f6aeca8ec6d8f1929bff720c99152cb4c130 Author: John McDonnell <john.mcdonnell@bearingpoint.com> Date: 2017-10-11T16:55:24Z [NETBEANS-54] Added missing licenses and replaced oracle license in a single file. ----
          402. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/52
          403. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/52 The remarks were fixed (templates lost their headers again) and the result merged into master.
          404. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/113 For the record: The content of the two binaries is identical, the files from maven central and the original netbeans file were zipped with different timestamps and differing directory order. Diffoscope output is here: https://try.diffoscope.org/qayzdzqugqge.html To check yourself: unzip both files and run a recursive diff over it.
          405. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/113
          406. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/113 I squashed your two commits together and merged this.
          407. Github user vieiro commented on the issue: https://github.com/apache/incubator-netbeans/pull/113 Thanks Matthias. If you ever happen to visit Madrid you know you have some free beers here.
          408. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/114 Sorry! I overlooked the patch case. I did not know it yet, but you can add comments to diff patches: https://stackoverflow.com/questions/18979120/is-it-possible-to-add-a-comment-to-a-diff-file-unified So I suggest to just add an ALv2 header to the file. With regard to the squash question: Please do so, this way the atomic change is contained in one commit.
          409. Github user mcdonnell-john commented on the issue: https://github.com/apache/incubator-netbeans/pull/99 @matthiasblaesing I've checked out the PR and it builds fine on my machine. After running it I've not seen any issues with the menu. Been able to open projects. Look at the about dialog, etc. and in general, all menus seem to be working the same as they do on 8.2. Any specific checks you want me to perform?
          410. Github user vieiro commented on the issue: https://github.com/apache/incubator-netbeans/pull/116 Please don't commit yet, I think there's a typo here.
          411. Github user junichi11 commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/117#discussion_r144195122 --- Diff: j2ee.persistence/l10n.list --- @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. --- End diff -- l10n.list is "Problems to be solved centrally". https://cwiki.apache.org/confluence/display/NETBEANS/List+of+Modules+to+Review
          412. Github user junichi11 commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/117#discussion_r144195169 --- Diff: j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/ui/resources/persistence-1.0.xml --- @@ -1,5 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> --- End diff -- persistance-*.xml files are copied: https://github.com/apache/incubator-netbeans/blob/ff1bc6c47951f9f42231c0c06ff58fbfc99f810e/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/provider/ProviderUtil.java#L866-L872 So, please undo changes then, should be added to rat excludes.
          413. Github user junichi11 commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/117#discussion_r144195193 --- Diff: j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/ui/resources/persistence-2.1.xml --- @@ -1,5 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> --- End diff -- The same as persistence-1.0.xml.
          414. Github user junichi11 commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/117#discussion_r144196190 --- Diff: j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/jpacontroller/resources/PreexistingEntityException.java.txt --- @@ -1,3 +1,21 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ --- End diff -- The same as IllegalOrphanException.java.txt.
          415. Github user junichi11 commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/117#discussion_r144195286 --- Diff: j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/jpacontroller/resources/IllegalOrphanException.java.txt --- @@ -1,3 +1,21 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ --- End diff -- *.java.txt files are used here: https://github.com/apache/incubator-netbeans/blob/ff1bc6c47951f9f42231c0c06ff58fbfc99f810e/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/jpacontroller/JpaControllerIterator.java#L190-L209 So, please undo changes then, should be added to rat excludes.
          416. Github user junichi11 commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/117#discussion_r144195299 --- Diff: j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/jpacontroller/resources/NonexistentEntityException.java.txt --- @@ -1,3 +1,21 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ --- End diff -- The same as IllegalOrphanException.java.txt.
          417. Github user junichi11 commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/117#discussion_r144196199 --- Diff: j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/jpacontroller/resources/RollbackFailureException.java.txt --- @@ -1,3 +1,21 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ --- End diff -- The same as IllegalOrphanException.java.txt.
          418. Github user junichi11 commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/117#discussion_r144195184 --- Diff: j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/ui/resources/persistence-2.0.xml --- @@ -1,5 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> --- End diff -- The same as persistence-1.0.xml.
          419. Github user junichi11 commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/117#discussion_r144196133 --- Diff: j2ee.persistence/test/unit/data/invalid_persistence.xml --- @@ -1,8 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> -<persisten +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -ce version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"> + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"> --- End diff -- Please undo this line. New lines are added intentionally to test the invalid file. ``` <persisten ce ```
          420. GitHub user vieiro opened a pull request: https://github.com/apache/incubator-netbeans/pull/131 [NETBEANS-54] Module Review lib.terminalemulator - Added Apache license to different files. - genfiles.properties, build-impl.xml and manifest.mf files to be handled centrally. - No other licensing issues found. You can merge this pull request into a Git repository by running: $ git pull https://github.com/vieiro/incubator-netbeans netbeans-54-module-review-lib.terminalemulator Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/131.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #131 ---- commit fb537c4edb3a891267df85fb79d5ac331d18975d Author: Antonio Vieiro <antonio@vieiro.net> Date: 2017-10-12T16:15:22Z [NETBEANS-54] Module Review lib.terminalemulator - Added Apache license to different files. - genfiles.properties, build-impl.xml and manifest.mf files to be handled centrally. - No other licensing issues found. ----
          421. Github user vieiro commented on the issue: https://github.com/apache/incubator-netbeans/pull/116 Typo solved, build passing. Ready for commit review. Feel free to squash.
          422. GitHub user vieiro opened a pull request: https://github.com/apache/incubator-netbeans/pull/132 [NETBEANS-54] Module Review mercurial - Added license to l10n.list - Added templates & test files to rat exclusion list - No other licensing issues found. You can merge this pull request into a Git repository by running: $ git pull https://github.com/vieiro/incubator-netbeans netbeans-54-module-review-mercurial Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/132.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #132 ---- commit 06aee948f398e63b064d70bdfa9385bf630dd2f4 Author: Antonio Vieiro <antonio@vieiro.net> Date: 2017-10-12T16:38:32Z [NETBEANS-54] Module Review mercurial - Added license to l10n.list - Added templates & test files to rat exclusion list - No other licensing issues found. ----
          423. GitHub user vieiro opened a pull request: https://github.com/apache/incubator-netbeans/pull/133 [NETBEANS-54] Module Review libs.cglib - Updated maven coordinates for the external binary. - Added cglib-2.2 license from https://github.com/cglib/cglib - No other licensing issues found. You can merge this pull request into a Git repository by running: $ git pull https://github.com/vieiro/incubator-netbeans netbeans-54-module-review-libs.cglib Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/133.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #133 ---- commit f5bacc6a843d8cf26e5a5d76273ae7181b36c1e4 Author: Antonio Vieiro <antonio@vieiro.net> Date: 2017-10-12T16:57:00Z [NETBEANS-54] Module Review libs.cglib - Updated maven coordinates for the external binary. - Added cglib-2.2 license from https://github.com/cglib/cglib - No other licensing issues found. ----
          424. GitHub user borxa opened a pull request: https://github.com/apache/incubator-netbeans/pull/134 [NETBEANS-54] Module Review httpserver Updated maven coordinates for the external binary. You can merge this pull request into a Git repository by running: $ git pull https://github.com/borxa/incubator-netbeans master Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/134.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #134 ---- commit e03c6cd62263a372fa018c524ebcd50e88cf7aa4 Author: Borxa Varela Bouzas <borxa@varelabouzas.net> Date: 2017-10-12T18:47:41Z [NETBEANS-54] Module Review httpserver ----
          425. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/116
          426. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/99 @mcdonnell-john thank you for having a look - this was what I wanted to have ensured. Call it quick-test or smoke test, just to make sure the functions work in general. For me this is good to go in.
          427. GitHub user vieiro opened a pull request: https://github.com/apache/incubator-netbeans/pull/135 [NETBEANS-54] Module Review dlight.nativeexecution - The external/exechlp-1.0.zip binary is generated by the scripts and code in tools/ - So I'm assuming this is an Apache 2.0 license as well. - Added license headers to makefiles and different scripts - No other licensing headers required. - Test org.netbeans.modules.nativeexecution.api.util.ConnectionManagerTest failed in my box. You can merge this pull request into a Git repository by running: $ git pull https://github.com/vieiro/incubator-netbeans netbeans-54-module-review-dlight.nativeexecution Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/135.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #135 ---- commit c95443b31fd265e7c84f732049b019b42984e7c7 Author: Antonio Vieiro <antonio@vieiro.net> Date: 2017-10-12T20:22:16Z [NETBEANS-54] Module Review dlight.nativeexecution - The external/exechlp-1.0.zip binary is generated by the scripts and code in tools/ - So I'm assuming this is an Apache 2.0 license as well. - Added license headers to makefiles and different scripts - No other licensing headers required. - Test org.netbeans.modules.nativeexecution.api.util.ConnectionManagerTest failed in my box. ----
          428. GitHub user junichi11 opened a pull request: https://github.com/apache/incubator-netbeans/pull/136 [NETBEANS-54] Module Review hibernate - Update the license header in Bundle.properties (a missing change in #82) - Exclude template files from rat You can merge this pull request into a Git repository by running: $ git pull https://github.com/junichi11/incubator-netbeans module-review-hibernate Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/136.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #136 ---- commit a3cc59133cfbae7686b410327f7e1fbb726f9764 Author: Junichi Yamamoto <junichi11@apache.org> Date: 2017-10-13T03:25:12Z [NETBEANS-54] Module Review hibernate - Update the license header Bundle.properties - Exclude template files from rat ----
          429. GitHub user junichi11 opened a pull request: https://github.com/apache/incubator-netbeans/pull/137 [NETBEANS-54] Module Review refactoring.api - no external library - checked Rat report: update the license header in translate.names - skimmed through the module, did not notice additional problems You can merge this pull request into a Git repository by running: $ git pull https://github.com/junichi11/incubator-netbeans module-review-refactoring.api Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/137.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #137 ---- commit db29209df7e928734b70bf98ff0eb0a7d4e28dde Author: Junichi Yamamoto <junichi11@apache.org> Date: 2017-10-13T04:17:36Z [NETBEANS-54] Module Review refactoring.api - no external library - checked Rat report: update the license header in translate.names - skimmed through the module, did not notice additional problems ----
          430. GitHub user vieiro opened a pull request: https://github.com/apache/incubator-netbeans/pull/138 [NETBEANS-54] Module Review extexecution.process - Updated coordinates for libpam4j from Maven central (MIT) - winp binary (MIT) in this directory is a patched version from the one in Maven. Added maven coordinates as a comment in binaries-list. - libpam4j (MIT) is not available in Maven central, the homepage was hosted in kenai, now gone. - Unit tests passing. - No other licensing issues found. You can merge this pull request into a Git repository by running: $ git pull https://github.com/vieiro/incubator-netbeans netbeans-54-module-review-extexecution.process Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/138.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #138 ---- commit 6785399cb69bb3da7513c7081ad5efbaebbc0ce6 Author: Antonio Vieiro <antonio@vieiro.net> Date: 2017-10-13T05:29:22Z [NETBEANS-54] Module Review extexecution.process - Updated coordinates for libpam4j from Maven central (MIT) - winp binary (MIT) in this directory is a patched version from the one in Maven. Added maven coordinates as a comment in binaries-list. - libpam4j (MIT) is not available in Maven central, the homepage was hosted in kenai, now gone. - Unit tests passing. - No other licensing issues found. ----
          431. Github user jlahoda commented on the issue: https://github.com/apache/incubator-netbeans/pull/99 Merged: https://git-wip-us.apache.org/repos/asf?p=incubator-netbeans.git;a=commit;h=56c952886e51619183a234ffcd7738910de5f31f Thanks for the comments/testing.
          432. Github user jlahoda closed the pull request at: https://github.com/apache/incubator-netbeans/pull/99
          433. GitHub user vieiro opened a pull request: https://github.com/apache/incubator-netbeans/pull/139 [NETBEANS-54] Module Review ide.kit - No external binaries. - Added Apache license to different xml/properties files and release/VERSION.txt. - Added rat exclusion list for all qa-functional/**/*.txt files. - Remaining files to be handled centrally. - No other licensing issues found. You can merge this pull request into a Git repository by running: $ git pull https://github.com/vieiro/incubator-netbeans netbeans-54-module-review-ide.kit Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/139.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #139 ---- commit 13004772593a16a69f861b6b7f049137e6ee2ffa Author: Antonio Vieiro <antonio@vieiro.net> Date: 2017-10-13T08:13:17Z [NETBEANS-54] Module Review ide.kit - No external binaries. - Added Apache license to different xml/properties files and release/VERSION.txt. - Added rat exclusion list for all qa-functional/**/*.txt files. - Remaining files to be handled centrally. - No other licensing issues found. ----
          434. GitHub user geertjanw opened a pull request: https://github.com/apache/incubator-netbeans/pull/140 [NETBEANS-54] Module Review java.editor create shell script You can merge this pull request into a Git repository by running: $ git pull https://github.com/geertjanw/incubator-netbeans netbeans-54-review-java.editor.completion.create Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/140.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #140 ---- commit 63820d93eba17dcd527b64f4bce49ddfffb7600e Author: geertjan <geertjan.wielenga@oracle.com> Date: 2017-10-13T10:20:21Z [NETBEANS-54] Module Review java.editor create shell script ----
          435. Github user geertjanw commented on the issue: https://github.com/apache/incubator-netbeans/pull/126 This would be good to merge, since there are many files we'll be able to exclude from the Rat report in this way.
          436. GitHub user geertjanw opened a pull request: https://github.com/apache/incubator-netbeans/pull/141 [NETBEANS-54] Module Review nbjunit You can merge this pull request into a Git repository by running: $ git pull https://github.com/geertjanw/incubator-netbeans netbeans-54-review-nbjunit Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/141.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #141 ---- commit d854053c1f6a86c4fe382217f50b48291ad943a3 Author: geertjan <geertjan.wielenga@oracle.com> Date: 2017-10-13T10:44:49Z [NETBEANS-54] Module Review nbjunit ----
          437. GitHub user vieiro opened a pull request: https://github.com/apache/incubator-netbeans/pull/142 [NETBEANS-54] Module Review spi.debugger.ui - No external binaries. - Removed previous license from many META-INF files. - Two files to be handled centrally (*.sig, manifest.mf) - Two tests failing (both before and after changes): org.netbeans.api.debugger.ProvidersAnnotationTest and org.netbeans.api.debugger.WatchesTest - No other licensing issues found. You can merge this pull request into a Git repository by running: $ git pull https://github.com/vieiro/incubator-netbeans netbeans-54-module-review-spi.debugger.ui Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/142.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #142 ---- commit 9f656ca7709f69e78eb2b61c42441e3744c35d69 Author: Antonio Vieiro <antonio@vieiro.net> Date: 2017-10-13T16:41:08Z [NETBEANS-54] Module Review spi.debugger.ui - No external binaries. - Removed previous license from many META-INF files. - Two files to be handled centrally (*.sig, manifest.mf) - Two tests failing (both before and after changes): org.netbeans.api.debugger.ProvidersAnnotationTest and org.netbeans.api.debugger.WatchesTest - No other licensing issues found. ----
          438. Github user vieiro commented on the issue: https://github.com/apache/incubator-netbeans/pull/135 The assumption is correct: external/exchlp-1.0.zip (generated within the module)[ is indeed covered by the Apache 2.0 License:](https://mail-archives.apache.org/mod_mbox/incubator-netbeans-dev/201710.mbox/%3c59E0859A.6020808@oracle.com%3e)
          439. GitHub user vieiro opened a pull request: https://github.com/apache/incubator-netbeans/pull/143 [NETBEANS-54] Module Review o.apache.ws.commons.util - Updated maven coordinates for Apache WS Commons Util (Apache 2.0) - No notice found at http://svn.apache.org/viewvc/webservices/commons/trunk/modules/util/ - No other licensing issues found (manifest.mf to be handled centrally) You can merge this pull request into a Git repository by running: $ git pull https://github.com/vieiro/incubator-netbeans netbeans-54-module-review-o.apache.ws.commons.util Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/143.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #143 ---- commit 2974aa36c45c994f5d0f82ef8636eeb7d22d6240 Author: Antonio Vieiro <antonio@vieiro.net> Date: 2017-10-13T17:16:02Z [NETBEANS-54] Module Review o.apache.ws.commons.util - Updated maven coordinates for Apache WS Commons Util (Apache 2.0) - No notice found at http://svn.apache.org/viewvc/webservices/commons/trunk/modules/util/ - No other licensing issues found (manifest.mf to be handled centrally) ----
          440. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/143
          441. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/143 The binary file is effectively identical. The difference is in the pom.xml files: https://try.diffoscope.org/tsvpkrrvedcy.html
          442. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/142 Nice!
          443. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/142
          444. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/141
          445. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/140
          446. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/137 Looks good.
          447. Github user vieiro commented on the issue: https://github.com/apache/incubator-netbeans/pull/134 Hi, All tests should pass now, but I think the line <runtime-relative-path>ext/webserver-3.2.4.jar</runtime-relative-path> should look like <runtime-relative-path>ext/webserver.jar</runtime-relative-path> The "runtime relative path" is the final destination path of the jar when the IDE/platform is built. If this is changed I think that any other modules referring to this jar may fail at runtime
          448. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/133
          449. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/128
          450. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/128 Thank you.
          451. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/126
          452. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/126 Agreed. I rebased the changes onto head and merged that. Thank you.
          453. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/118
          454. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/119
          455. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/118 New binaries contain signatures - this might be a problem in the future, if so the build process need to be adjusted to strip the signatures away. Thank you.
          456. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/119 New binaries contain signatures - this might be a problem in the future, if so the build process need to be adjusted to strip the signatures away. Thank you.
          457. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/139
          458. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/132
          459. GitHub user geertjanw opened a pull request: https://github.com/apache/incubator-netbeans/pull/145 [NETBEANS-54] Module Review apisupport.wizards You can merge this pull request into a Git repository by running: $ git pull https://github.com/geertjanw/incubator-netbeans netbeans-54-review-apisupport.wizards Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/145.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #145 ---- commit e8b78b6c7b6ff143638358d6144431fb9ee35b99 Author: geertjan <geertjan.wielenga@oracle.com> Date: 2017-10-14T10:11:18Z [NETBEANS-54] Module Review apisupport.wizards ----
          460. GitHub user matthiasblaesing opened a pull request: https://github.com/apache/incubator-netbeans/pull/146 [NETBEANS-54] Add ALv2 header to l10n.list files You can merge this pull request into a Git repository by running: $ git pull https://github.com/matthiasblaesing/incubator-netbeans l10n_fix Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/146.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #146 ---- commit b6179c1810494f3b29af8965fd4bfbb3cd0c39b6 Author: Matthias Bläsing <mblaesing@doppel-helix.eu> Date: 2017-10-14T11:07:05Z [NETBEANS-54] Add ALv2 header to l10n.list files ----
          461. GitHub user matthiasblaesing opened a pull request: https://github.com/apache/incubator-netbeans/pull/147 [NETBEANS-54] Recursively exclude generated project files You can merge this pull request into a Git repository by running: $ git pull https://github.com/matthiasblaesing/incubator-netbeans exclude_generated_files Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/147.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #147 ---- commit e769395edc2a4c5139b365aade7418ce788381e4 Author: Matthias Bläsing <mblaesing@doppel-helix.eu> Date: 2017-10-14T11:30:42Z [NETBEANS-54] Recursively exclude generated project files ----
          462. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/147 Closing - I'll regroup this into a larger set
          463. Github user matthiasblaesing closed the pull request at: https://github.com/apache/incubator-netbeans/pull/147
          464. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/146 Closing - I'll regroup this into a larger set
          465. Github user matthiasblaesing closed the pull request at: https://github.com/apache/incubator-netbeans/pull/146
          466. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/137
          467. GitHub user matthiasblaesing opened a pull request: https://github.com/apache/incubator-netbeans/pull/148 [NETBEANS-54] Fix central problems - l10n.list - build.xml - project.xml - project.properties - platform.properties - added recursive exclusions for generated files You can merge this pull request into a Git repository by running: $ git pull https://github.com/matthiasblaesing/incubator-netbeans central_problems Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/148.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #148 ---- commit 05ef0964f3bb82f54806840aeccbdcf78966bbbe Author: Matthias Bläsing <mblaesing@doppel-helix.eu> Date: 2017-10-14T11:07:05Z [NETBEANS-54] Add ALv2 header to l10n.list files This closes: #121 commit d9d6c141ac7814414c0617b1b93052cc33995abc Author: Matthias Bläsing <mblaesing@doppel-helix.eu> Date: 2017-10-14T12:28:12Z [NETBEANS-54] Added/updated ALv2 header for project.properties commit 014f2f1cb68aca0a99671593719d9fb25fb9d6e6 Author: Matthias Bläsing <mblaesing@doppel-helix.eu> Date: 2017-10-14T11:30:42Z [NETBEANS-54] Recursively exclude generated project files commit dcf551341c8f9deae9bd2d96784589d3e4b3de8f Author: Matthias Bläsing <mblaesing@doppel-helix.eu> Date: 2017-10-14T14:32:06Z [NETBEANS-54] Added/updated ALv2 header for build.xml commit df1ac4253423d1b2067cff7e05ebf757c3ec646b Author: Matthias Bläsing <mblaesing@doppel-helix.eu> Date: 2017-10-14T14:39:32Z [NETBEANS-54] Added/updated ALv2 header for project.xml commit 8fe8f79460c307f4941518bc01673547eeb6b9f3 Author: Matthias Bläsing <mblaesing@doppel-helix.eu> Date: 2017-10-14T14:47:38Z [NETBEANS-54] Add license to platform.properties ----
          468. GitHub user vieiro opened a pull request: https://github.com/apache/incubator-netbeans/pull/149 [NETBEANS-54] Module Review o.apache.xmlrpc - Added three entries in binaries-list with Maven coordinates for Apache XMLRPC 3.0 files (Apache 2.0) - No notice files found at https://svn.apache.org/repos/asf/webservices/archive/xmlrpc/tags/XMLRPC_3_0/ - No other licensing issues found. You can merge this pull request into a Git repository by running: $ git pull https://github.com/vieiro/incubator-netbeans netbeans-54-module-review-o.apache.xmlrpc Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/149.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #149 ---- commit 8ed166ac643b9f5facd6a25d9c4aab02206f773f Author: Antonio Vieiro <antonio@vieiro.net> Date: 2017-10-14T15:26:38Z [NETBEANS-54] Module Review o.apache.xmlrpc - Added three entries in binaries-list with Maven coordinates for Apache XMLRPC 3.0 files (Apache 2.0) - No notice files found at https://svn.apache.org/repos/asf/webservices/archive/xmlrpc/tags/XMLRPC_3_0/ - No other licensing issues found. ----
          469. GitHub user vieiro opened a pull request: https://github.com/apache/incubator-netbeans/pull/150 [NETBEANS-54] Module Review o.eclipse.core.contenttype - Added maven coordinates for for org/eclipse/core/contenttype (EPL 1.0) - Updated nbproject/* to reflect the change in the binary. - NOTE: Maven jar file is signed (original was not). - No other licensing issues found. You can merge this pull request into a Git repository by running: $ git pull https://github.com/vieiro/incubator-netbeans netbeans-54-module-review-o.eclipse.core.contenttype Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/150.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #150 ---- commit d8d20cf432a41bd0b47bebe00be5bf5caff3f8ce Author: Antonio Vieiro <antonio@vieiro.net> Date: 2017-10-14T15:52:09Z [NETBEANS-54] Module Review o.eclipse.core.contenttype - Added maven coordinates for for org/eclipse/core/contenttype (EPL 1.0) - Updated nbproject/* to reflect the change in the binary. - NOTE: Maven jar file is signed (original was not). - No other licensing issues found. ----
          470. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/120
          471. GitHub user vieiro opened a pull request: https://github.com/apache/incubator-netbeans/pull/151 [NETBEANS-54] Module Review o.eclipse.core.jobs - Exact version 3.5.101 could not be found in Maven, downgrading to 3.5.100 - Updated binaries-list with maven coordinates for eclipse core jobs 3.5.100 (EPL 1.0) - Updated nbproject/* accordingly. - No other licensing issues found. You can merge this pull request into a Git repository by running: $ git pull https://github.com/vieiro/incubator-netbeans netbeans-54-module-review-o.eclipse.core.jobs Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/151.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #151 ---- commit 7a7bd38207e92d911ba2dc49b16f380cfffb9a65 Author: Antonio Vieiro <antonio@vieiro.net> Date: 2017-10-14T18:39:53Z [NETBEANS-54] Module Review o.eclipse.core.jobs - Exact version 3.5.101 could not be found in Maven, downgrading to 3.5.100 - Updated binaries-list with maven coordinates for eclipse core jobs 3.5.100 (EPL 1.0) - Updated nbproject/* accordingly. - No other licensing issues found. ----
          472. Github user juneau001 commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/117#discussion_r144706106 --- Diff: j2ee.persistence/test/unit/data/invalid_persistence.xml --- @@ -1,8 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> -<persisten +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -ce version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"> + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"> --- End diff -- Reverted back...sorry about that!
          473. Github user juneau001 commented on the issue: https://github.com/apache/incubator-netbeans/pull/117 Made all requested changes...will add those files as mentioned to the Rat report
          474. Github user junichi11 commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/145#discussion_r144706085 --- Diff: apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/actionListener.javx --- @@ -1,41 +1,22 @@ -<#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +<!-- --- End diff -- Template files for module development are not user visible at the moment. https://github.com/apache/incubator-netbeans/blob/c3fcc0a3fdd8e6c7ab2055118798c77e06bae972/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/common/layer.xml#L29-L92 So, I think that there is no problem to add the license header to them. However, would you please fix the comment tag from `<!--` to `<#--` if license headers for template file are not removed(template files are not added to rat excludes)?
          475. Github user junichi11 commented on the issue: https://github.com/apache/incubator-netbeans/pull/117 Thank you for fixing them.
          476. Github user junichi11 commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/117#discussion_r144706417 --- Diff: j2ee.persistence/test/unit/data/invalid_persistence.xml --- @@ -1,8 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> -<persisten +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<persisten -ce version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"> + ce version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"> --- End diff -- Perhaps, we should not add whitespaces there. (we should not change other than the license header.)
          477. Github user juneau001 commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/117#discussion_r144708411 --- Diff: j2ee.persistence/test/unit/data/invalid_persistence.xml --- @@ -1,8 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> -<persisten +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<persisten -ce version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"> + ce version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"> --- End diff -- Believe whitespace is removed now...sorry about that!
          478. Github user geertjanw commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/145#discussion_r144708728 --- Diff: apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/actionListener.javx --- @@ -1,41 +1,22 @@ -<#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +<!-- --- End diff -- OK, didn't know there's a difference between `<!--` and `<#--` Can you tell me the difference?
          479. Github user junichi11 commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/145#discussion_r144712225 --- Diff: apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/actionListener.javx --- @@ -1,41 +1,22 @@ -<#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +<!-- --- End diff -- `<#-- -->` is a freemarker comment: http://freemarker.org/docs/dgui_template_overallstructure.html `<!-- -->` is a XML/HTML comment. This difference is important. Templates are processed by freemarker. So if `<#-- -->` is used in a template file, generated code does not have the comment block(`<#-- -->`). However, `<!-- -->` is used in it, generated code has the comment block(`<!-- -->`). In this case, the generated code will have the license header. BTW, if template files are user visible(e.g. Tools > Templates > Select Something > Open in editor), probably, we should not add the license header. (we should add them to rat excludes.) https://lists.apache.org/thread.html/43bec9e29901ef8d935c2f1515c2b7710c6a7e0b32657c3ddc1468c4@%3Cdev.netbeans.apache.org%3E
          480. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/148
          481. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/121
          482. Github user geertjanw commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/145#discussion_r144720315 --- Diff: apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/actionListener.javx --- @@ -1,41 +1,22 @@ -<#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +<!-- --- End diff -- These licenses are not user visible, so I will change <!-- back to <#-- Thanks.
          483. Github user geertjanw commented on the issue: https://github.com/apache/incubator-netbeans/pull/7 Is anything more needed to be done here or can this one be merged?
          484. GitHub user mclay opened a pull request: https://github.com/apache/incubator-netbeans/pull/153 [NETBEANS-54] Module Review maven.osgi Cleanup NetBeans license header for module maven.osgi #145 You can merge this pull request into a Git repository by running: $ git pull https://github.com/mclay/incubator-netbeans netbean_54_maven_osgi Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-netbeans/pull/153.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #153 ---- commit 85fbf2b197f0b0aad90e0bb8076f5e87193b7131 Author: Michael Clay <michael.clay@codeworkz.at> Date: 2017-10-15T14:24:03Z a[NETBEANS-54] Module Review maven.osgi ----
          485. Github user geertjanw commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/104#discussion_r144721265 --- Diff: libs.osgi/external/binaries-list --- @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD osgi.cmpn-4.2.jar -2F2FBFF3FB80F91B159A7FA9F0C42A894BB8BCC5 osgi.core-5.0.0.jar +972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD org.netbeans.external:osgi.cmpn:4.2 --- End diff -- I'd rather wait until later to do this. This co-ordinate works (http://mvnrepository.com/artifact/org.netbeans.external/osgi.cmpn-4.2/RELEASE82) and is closer to the original entry in binaries-list than the primary equivalent.
          486. Github user mclay commented on the issue: https://github.com/apache/incubator-netbeans/pull/153 https://github.com/emilianbold/incubator-netbeans/issues/145
          487. Github user matthiasblaesing commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/104#discussion_r144722875 --- Diff: libs.osgi/external/binaries-list --- @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD osgi.cmpn-4.2.jar -2F2FBFF3FB80F91B159A7FA9F0C42A894BB8BCC5 osgi.core-5.0.0.jar +972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD org.netbeans.external:osgi.cmpn:4.2 --- End diff -- Your link shows, that the referenced binary is not present in maven central, but only in the netbeans repository (see the "Repositories" row). The download binaries task has maven central hard-coded, so the binary won't be found. It works for you (and me), because there are multiple fallbacks: - local maven2 cache ($HOME/.m2/repository) - fallback to load the file from `http://hg.netbeans.org/binaries/` I would not change the binary reference, as currently there is no valuable alternative. And I can support your assessment not to change the binary right now. This makes it clear, that this needs to be tackled later.
          488. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/7
          489. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/7 Merged - thank you!
          490. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/73 @varaghar sorry - the fix for this file was merged via a bigger changeset, that tackled to problem for all build.xml files. Would you please close this PR? Thank you!
          491. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/150
          492. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/150 I squashed the changes together. The binaries differ in the sigining information: https://try.diffoscope.org/verbgtdavxyv.html
          493. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/149
          494. Github user matthiasblaesing commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/124#discussion_r144725205 --- Diff: o.apache.tools.ant.module/src/org/apache/tools/ant/module/resources/Project.xml_ --- @@ -1,4 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- --- End diff -- This license header is new - it will be copied into the user file verbatim. Please add an exclusion for this file in the rat report with a comment along the line "user visible template file" and remove the license header.
          495. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/115
          496. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/123
          497. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/138
          498. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/151
          499. Github user matthiasblaesing commented on the issue: https://github.com/apache/incubator-netbeans/pull/131 There are a few files were you added the ALv2 at the end of the file. As most license scanners expect it at the top, it would be good to retain that assumption. So could you update these files accordingly? If you need a short form of the license, it is available: http://www.apache.org/legal/src-headers.html#is-a-short-form-of-the-source-header-available
          500. Github user vieiro commented on the issue: https://github.com/apache/incubator-netbeans/pull/131 Definitely, expect this whithin 24-48h from now. Sorry & thanks for the link.
          501. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/125
          502. Github user asfgit closed the pull request at: https://github.com/apache/incubator-netbeans/pull/135
          503. Github user mcdonnell-john commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/124#discussion_r144731085 --- Diff: o.apache.tools.ant.module/src/org/apache/tools/ant/module/resources/Project.xml_ --- @@ -1,4 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- --- End diff -- Cool, Ill address this tomorrow
          504. Github user junichi11 commented on a diff in the pull request: https://github.com/apache/incubator-netbeans/pull/117#discussion_r144731244 --- Diff: j2ee.persistence/test/unit/data/invalid_persistence.xml --- @@ -1,8 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> -<persisten +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<persisten -ce version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"> + ce version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"> --- End diff -- You need not apologize at all. Thank you for working on this.
          505. Github user junichi11 commented on the issue: https://github.com/apache/incubator-netbeans/pull/117 @matthiasblaesing What should we do about the external binary (https://github.com/apache/incubator-netbeans/tree/master/j2ee.persistence/external)?
          506. Github user junichi11 commented on the issue: https://github.com/apache/incubator-netbeans/pull/153 @mclay Thank you for working on it. However, if you come from @emilianbold 's repo (https://github.com/emilianbold/incubator-netbeans), you should send your PR there. i.e. not `apache:master` but `emilianbold:master`.
          507. Github user vieiro commented on the issue: https://github.com/apache/incubator-netbeans/pull/131 Should be ready now.
          508. geertjanw commented on issue #179: [NETBEANS-54] Module Review java.hints (part 1) URL: https://github.com/apache/incubator-netbeans/pull/179#issuecomment-338511998 OK, merging. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          509. geertjanw closed pull request #179: [NETBEANS-54] Module Review java.hints (part 1) URL: https://github.com/apache/incubator-netbeans/pull/179 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/java.hints/src/org/netbeans/modules/java/hints/errors/ImportClass.java b/java.hints/src/org/netbeans/modules/java/hints/errors/ImportClass.java index 762c2adb1..e9b0307ef 100644 --- a/java.hints/src/org/netbeans/modules/java/hints/errors/ImportClass.java +++ b/java.hints/src/org/netbeans/modules/java/hints/errors/ImportClass.java @@ -1,45 +1,20 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file thatfake - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * Contributor(s): +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * The Original Software is NetBeans. The Initial Developer of the Original - * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun - * Microsystems, Inc. All Rights Reserved. + * http://www.apache.org/licenses/LICENSE-2.0 * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.netbeans.modules.java.hints.errors; diff --git a/java.hints/src/org/netbeans/modules/java/hints/errors/Utilities.java b/java.hints/src/org/netbeans/modules/java/hints/errors/Utilities.java index df1babce3..18afd9bd3 100644 --- a/java.hints/src/org/netbeans/modules/java/hints/errors/Utilities.java +++ b/java.hints/src/org/netbeans/modules/java/hints/errors/Utilities.java @@ -1,45 +1,20 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 1997-22010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * Contributor(s): +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * The Original Software is NetBeans. The Initial Developer of the Original - * Software is Sun Microsystems, Inc. Portions Copyright 1997-2010 Sun - * Microsystems, Inc. All Rights Reserved. + * http://www.apache.org/licenses/LICENSE-2.0 * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.netbeans.modules.java.hints.errors; diff --git a/java.hints/src/org/netbeans/modules/java/hints/resources/enabled.properties b/java.hints/src/org/netbeans/modules/java/hints/resources/enabled.properties index caa5dfac5..680c86872 100644 --- a/java.hints/src/org/netbeans/modules/java/hints/resources/enabled.properties +++ b/java.hints/src/org/netbeans/modules/java/hints/resources/enabled.properties @@ -1,39 +1,17 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved. +# http://www.apache.org/licenses/LICENSE-2.0 # -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. -# -# Contributor(s): -# Enable the hint +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. enabled=true diff --git a/java.hints/src/org/netbeans/modules/java/hints/resources/jdk8.properties b/java.hints/src/org/netbeans/modules/java/hints/resources/jdk8.properties index 14f08c413..cd0356970 100644 --- a/java.hints/src/org/netbeans/modules/java/hints/resources/jdk8.properties +++ b/java.hints/src/org/netbeans/modules/java/hints/resources/jdk8.properties @@ -1,39 +1,17 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved. +# http://www.apache.org/licenses/LICENSE-2.0 # -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. -# -# Contributor(s): -# Default properties of 'Convert to JDK8' configuration +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. display.name=Migrate to JDK 8 diff --git a/java.hints/src/org/netbeans/modules/java/hints/resources/layer.xml b/java.hints/src/org/netbeans/modules/java/hints/resources/layer.xml index a1d09e3a3..8ba4c7903 100644 --- a/java.hints/src/org/netbeans/modules/java/hints/resources/layer.xml +++ b/java.hints/src/org/netbeans/modules/java/hints/resources/layer.xml @@ -1,48 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd"> <!-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License")/ You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" - -Contributor(s): - -The Original Software is NetBeans. The Initial Developer of the Original -Software is Sun Microsystems, Inc. Portions Copyright 1997-2010 Sun -Microsystems, Inc. All Rights Reserved. - -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. --> <filesystem> <folder name="Actions"> ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          510. geertjanw commented on issue #178: [NETBEANS-54] Module Review schema2beans URL: https://github.com/apache/incubator-netbeans/pull/178#issuecomment-338512032 Waiting for someone to review, will then merge this. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          511. geertjanw commented on a change in pull request #104: [NETBEANS-54] Module Review libs.osgi URL: https://github.com/apache/incubator-netbeans/pull/104#discussion_r146145620 ########## File path: libs.osgi/external/binaries-list ########## @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD osgi.cmpn-4.2.jar -2F2FBFF3FB80F91B159A7FA9F0C42A894BB8BCC5 osgi.core-5.0.0.jar +972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD org.netbeans.external:osgi.cmpn:4.2 Review comment: OK, thanks, merging. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          512. geertjanw closed pull request #104: [NETBEANS-54] Module Review libs.osgi URL: https://github.com/apache/incubator-netbeans/pull/104 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/libs.osgi/external/binaries-list b/libs.osgi/external/binaries-list index aadb02a39..17e5e684e 100644 --- a/libs.osgi/external/binaries-list +++ b/libs.osgi/external/binaries-list @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD osgi.cmpn-4.2.jar -2F2FBFF3FB80F91B159A7FA9F0C42A894BB8BCC5 osgi.core-5.0.0.jar +972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD org.netbeans.external:osgi.cmpn:4.2 +2F2FBFF3FB80F91B159A7FA9F0C42A894BB8BCC5 org.osgi:osgi.core:5.0.0 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          513. geertjanw commented on issue #163: [NETBEANS-54] Module Review maven.indexer URL: https://github.com/apache/incubator-netbeans/pull/163#issuecomment-338512219 Anything more needs to be done here? ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          514. matthiasblaesing commented on issue #104: [NETBEANS-54] Module Review libs.osgi URL: https://github.com/apache/incubator-netbeans/pull/104#issuecomment-338514000 Was there a reason for merging this against my advise? The maven coordinates are broken. Am 22. Oktober 2017 23:52:53 MESZ schrieb Geertjan Wielenga <notifications@github.com>: >geertjanw commented on this pull request. > > > >> @@ -14,5 +14,5 @@ > # KIND, either express or implied. See the License for the > # specific language governing permissions and limitations > # under the License. >-972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD osgi.cmpn-4.2.jar >-2F2FBFF3FB80F91B159A7FA9F0C42A894BB8BCC5 osgi.core-5.0.0.jar >+972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD >org.netbeans.external:osgi.cmpn:4.2 > >OK, thanks, merging. > >-- >You are receiving this because you commented. >Reply to this email directly or view it on GitHub: >https://github.com/apache/incubator-netbeans/pull/104#discussion_r146145620 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          515. rosslamont commented on issue #158: [NETBEANS-54] Module Review css.editor URL: https://github.com/apache/incubator-netbeans/pull/158#issuecomment-338515881 Very sorry about that. Asleep at the wheel. All sorted now. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          516. rosslamont commented on issue #163: [NETBEANS-54] Module Review maven.indexer URL: https://github.com/apache/incubator-netbeans/pull/163#issuecomment-338546812 Yes. Not sure what to do about the binary org.apache.maven.indexer:maven-indexer:6.0-SNAPSHOT My comment from earlier: "Regarding org.apache.maven.indexer:maven-indexer:6.0-SNAPSHOT, I suggest we clone that into apache/netbeans owned git, apply the patch, change the maven coordinates to make it netbeans owned and deploy back to maven central.” Not sure how you want to approach that. > On 23 Oct 2017, at 8:54 am, Geertjan Wielenga <notifications@github.com> wrote: > > Anything more needs to be done here? > > — > You are receiving this because you authored the thread. > Reply to this email directly, view it on GitHub <https://github.com/apache/incubator-netbeans/pull/163#issuecomment-338512219>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AXKC2H-yJ6WSuj7DoBsovuvDLFm3mj6yks5su7mZgaJpZM4P-f2H>. > ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          517. geertjanw commented on issue #104: [NETBEANS-54] Module Review libs.osgi URL: https://github.com/apache/incubator-netbeans/pull/104#issuecomment-338555136 Apologies, I misunderstood. I thought you meant we shouldn't change anything for now. Sorry, a lot, for misunderstanding. How should this issue be resolved? ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          518. geertjanw commented on issue #163: [NETBEANS-54] Module Review maven.indexer URL: https://github.com/apache/incubator-netbeans/pull/163#issuecomment-338555667 I think I'd leave them unchanged for the moment, i.e., we do not have to get everything from Maven, right now this minute. Do as much as you can in terms of the other JARs, i.e., the Lucene JARs, and let's handle that patch as a separate issue. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          519. junichi11 closed pull request #158: [NETBEANS-54] Module Review css.editor URL: https://github.com/apache/incubator-netbeans/pull/158 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/css.editor/src/org/netbeans/modules/css/editor/module/main/browsers/webkit.properties b/css.editor/src/org/netbeans/modules/css/editor/module/main/browsers/webkit.properties index b9bbe8372..5201e9303 100644 --- a/css.editor/src/org/netbeans/modules/css/editor/module/main/browsers/webkit.properties +++ b/css.editor/src/org/netbeans/modules/css/editor/module/main/browsers/webkit.properties @@ -1,42 +1,19 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER - -# Copyright 2011 Oracle and/or its affiliates. All rights reserved - -# Oracle and Java are registered trademarks of Oracle and/or its affiliates -# Other names may be trademarks of their respective owners - -# The contents of this file are subject to the terms of either the GN -# General Public License Version 2 only ("GPL") or the Commo -# Development and Distribution License("CDDL") (collectively, th -# "License"). You may not use this file except in compliance with th -# License. You can obtain a copy of the License a -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for th -# specific language governing permissions and limitations under th -# License. When distributing the software, include this License Heade -# Notice in each file and include the License file a -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates thi -# particular file as subject to the "Classpath" exception as provide -# by Oracle in the GPL Version 2 section of the License file tha -# accompanied this code. If applicable, add the following below th -# License Header, with the fields enclosed by brackets [] replaced b -# your own identifying information -# "Portions Copyrighted [year] [name of copyright owner] - -# If you wish your version of this file to be governed by only the CDD -# or only the GPL Version 2, indicate your decision by addin -# "[Contributor] elects to include this software in this distributio -# under the [CDDL or GPL Version 2] license." If you do not indicate -# single choice of license, a recipient has the option to distribut -# your version of this file under either the CDDL, the GPL Version 2 o -# to extend the choice of license to its licensees as provided above -# However, if you add GPL Version 2 code and therefore, elected the GP -# Version 2 license, then the option applies only if the new code i -# made subject to such option by the copyright holder +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Contributor(s) +# http://www.apache.org/licenses/LICENSE-2.0 # -# Portions Copyrighted 2011 Sun Microsystems, Inc. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. # #------------------------------------------------------------------------------- # diff --git a/css.editor/src/org/netbeans/modules/css/editor/module/main/properties/line.properties b/css.editor/src/org/netbeans/modules/css/editor/module/main/properties/line.properties index 412dcde7a..c4a5d26af 100644 --- a/css.editor/src/org/netbeans/modules/css/editor/module/main/properties/line.properties +++ b/css.editor/src/org/netbeans/modules/css/editor/module/main/properties/line.properties @@ -1,42 +1,19 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Copyright 2011 Oracle and/or its affiliates. All rights reserved. +# http://www.apache.org/licenses/LICENSE-2.0 # -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. -# -# Contributor(s): -# -# Portions Copyrighted 2011 Sun Microsystems, Inc. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. # # Css line layout module diff --git a/nbbuild/build.xml b/nbbuild/build.xml index 5a5e61cde..76e3f218f 100644 --- a/nbbuild/build.xml +++ b/nbbuild/build.xml @@ -2043,6 +2043,10 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <exclude name="css.prep/test/unit/data/testFiles/test.less" /> <!--simple file forss testing--> <exclude name="css.prep/test/unit/data/testFiles/testIssue227676.scss" /> <!--simple file for testing--> <exclude name="css.prep/test/unit/data/testProject/public_html/*" /> <!--simple files for testing--> + <exclude name="css.editor/test/unit/data/testfiles/**" /> <!--simple files for testing--> + <exclude name="css.editor/todo" /> <!-- no degree of creativity --> + <exclude name="css.editor/src/org/netbeans/modules/css/resources/CascadeStyleSheet.css.template" /> <!-- user visible template --> + <exclude name="css.editor/src/org/netbeans/modules/css/resources/CssExample" /> <!-- user visible template --> <exclude name="junit.ui/src/org/netbeans/modules/junit/ui/resources/*.template" /> <!--license would be visible when users edit the templates inside their IDE--> <exclude name="java.api.common/src/org/netbeans/modules/java/api/common/project/ui/customizer/vmo/gen/CommandLine.tokens" /> <!--generated by ANTLR--> <exclude name="javafx2.editor/test/unit/data/org/netbeans/modules/javafx2/editor/**/*.fxml" /> ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          520. junichi11 commented on issue #158: [NETBEANS-54] Module Review css.editor URL: https://github.com/apache/incubator-netbeans/pull/158#issuecomment-338557085 Just merged license header parts. Thank you for working on this! ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          521. rosslamont commented on issue #163: [NETBEANS-54] Module Review maven.indexer URL: https://github.com/apache/incubator-netbeans/pull/163#issuecomment-338573634 No worries Geertjan. Everything else is done. I'll log an issue regarding the patch and update the APIReview doc , but you can merge this one in I think... ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          522. rosslamont commented on issue #163: [NETBEANS-54] Module Review maven.indexer URL: https://github.com/apache/incubator-netbeans/pull/163#issuecomment-338573634 No worries Geertjan. Everything else is done. I'll log an issue regarding the patch and update the Module Review doc , but you can merge this one in I think... ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          523. rosslamont commented on issue #163: [NETBEANS-54] Module Review maven.indexer URL: https://github.com/apache/incubator-netbeans/pull/163#issuecomment-338578153 actually on second thoughts I should add a copyright notice to the patch, so hold off merging. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          524. rosslamont commented on issue #163: [NETBEANS-54] Module Review maven.indexer URL: https://github.com/apache/incubator-netbeans/pull/163#issuecomment-338583991 OK, I've pushed a squashed version with - copyright notice in the patch - exclusion for NOTICE-patched-indexer-core-6.0.0" (no degree of creativity) Good to go now. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          525. struberg commented on issue #178: [NETBEANS-54] Module Review schema2beans URL: https://github.com/apache/incubator-netbeans/pull/178#issuecomment-338614332 +1 to apply it. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          526. geertjanw opened a new pull request #180: [NETBEANS-54] Module Review java.hints.declarative URL: https://github.com/apache/incubator-netbeans/pull/180 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          527. junichi11 commented on issue #178: [NETBEANS-54] Module Review schema2beans URL: https://github.com/apache/incubator-netbeans/pull/178#issuecomment-338618424 It seems that failed unit tests increase. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          528. geertjanw commented on issue #178: [NETBEANS-54] Module Review schema2beans URL: https://github.com/apache/incubator-netbeans/pull/178#issuecomment-338618636 Failed unit tests increase because of this pull request? ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          529. struberg commented on issue #178: [NETBEANS-54] Module Review schema2beans URL: https://github.com/apache/incubator-netbeans/pull/178#issuecomment-338618680 Weird, the 2 commits just add ALv2 headers to a bunch of files. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          530. junichi11 commented on issue #178: [NETBEANS-54] Module Review schema2beans URL: https://github.com/apache/incubator-netbeans/pull/178#issuecomment-338620579 In my environment, Before: 24 tests success, 8 tests fail After: 16 tests success, 16 tests fail So, perhaps, there are problems in some schema2beans/test/unit/data files. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          531. juneau001 commented on issue #117: [NETBEANS-54] Modeule Review j2ee.persistence URL: https://github.com/apache/incubator-netbeans/pull/117#issuecomment-338632856 I've expanded the zip file and committed the changes. Let me know if I need to modify the license headers after the RAT checks. Thanks ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          532. geertjanw commented on issue #178: [NETBEANS-54] Module Review schema2beans URL: https://github.com/apache/incubator-netbeans/pull/178#issuecomment-338635407 Can you see which ones fail? I don't see a difference in terms of failed tests. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          533. JaroslavTulach commented on a change in pull request #172: [NETBEANS-54] Module Review o.apache.xml.resolver URL: https://github.com/apache/incubator-netbeans/pull/172#discussion_r146254955 ########## File path: o.apache.xml.resolver/build.xml ########## @@ -20,5 +20,43 @@ --> <project name="o.apache.xml.resolver" default="netbeans" basedir="."> + <import file="../nbbuild/templates/projectized.xml"/> + + <!-- A task to check if the binary 'external/resolver-1.2.jar exists --> + <target name="-check-requires-patching-maven-sources"> + <available file="external/resolver-1.2.jar" property="sources-already-patched" /> + </target> + + <!-- + '-javac-init' task is invoked after maven sources have been downloaded + to 'external/xml-resolver-1.2-sources.jar' + (see external/binaries-list). + Then if 'external/resolver-1.2.jar does NOT exist... + --> + <target name="-prepare-patched-binary" depends="-check-requires-patching-maven-sources" unless="sources-already-patched"> + <echo message="Patching xml-resolver-1.2-sources.jar for Netbeans..." /> + <!-- ... 1. Prepares a 'build/external-patch/[sources|classes]' working directories --> + <delete dir="build/external-patch" /> + <mkdir dir="build/external-patch/sources" /> + <!-- ... 2. Unzips maven sources --> + <unzip src="external/xml-resolver-1.2-sources.jar" dest="build/external-patch/sources" /> + <!-- ... 3. Applies patch 'external/xml-resolver-1.2-netbeans.patch --> + <patch dir="build/external-patch/sources" + patchfile="external/xml-resolver-1.2-netbeans.patch" + strip="0" /> + <!-- ... 4. Compiles sources to build/external-patch/classes --> + <mkdir dir="build/external-patch/classes" /> + <javac srcdir="build/external-patch/sources" + destdir="build/external-patch/classes" > + <exclude name="org/apache/xml/resolver/tests/**" /> + </javac> + <!-- ... 5. Creates a jar in 'external/resolver-1.2.jar' --> + <jar destfile="external/resolver-1.2.jar"> + <fileset dir="build/external-patch/classes" /> + </jar> Review comment: Looks like a clean way to solve the need for patches. Should this be more common, it would be good to move most of the script into `projectized.xml` and just configure it with properties from `nbproject/project.properties`. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          534. junichi11 commented on issue #178: [NETBEANS-54] Module Review schema2beans URL: https://github.com/apache/incubator-netbeans/pull/178#issuecomment-338651619 I attach results as screenshots. Sorry in Japanese UI. Before: ![nb-54-pr-178-before](https://user-images.githubusercontent.com/738383/31889591-55775902-b83b-11e7-93ea-d7f9715f5c2c.png) After: ![nb-54-pr-178-after](https://user-images.githubusercontent.com/738383/31889658-8f96ae58-b83b-11e7-8c14-566959c520ff.png) e.g. testExeptions log: ``` ------------- ---------------- --------------- Testcase: testExceptions(tests.MainTest): FAILED DIFF: incubator-netbeans/schema2beans/build/test/unit/work/t.M/e/testExceptions.diff 9 Finished compiling: 0 10 out: TestExceptions - creating the bean graph 11 out: TestExceptions - Hit Exception: class org.netbeans.modules.schema2beans.Schema2BeansException 12 - out: TestExceptions - Doc root 'EXCEPS' not found in the DOM graph! Found 'foo' instead. + out: TestExceptions - Doc root 'EXCEPS' not found in the DOM graph! Found '#comment' instead. 13 Finished running TestExceptions: 0 org.netbeans.junit.AssertionFileFailedError: DIFF: incubator-netbeans/schema2beans/build/test/unit/work/t.M/e/testExceptions.diff 9 Finished compiling: 0 10 out: TestExceptions - creating the bean graph 11 out: TestExceptions - Hit Exception: class org.netbeans.modules.schema2beans.Schema2BeansException 12 - out: TestExceptions - Doc root 'EXCEPS' not found in the DOM graph! Found 'foo' instead. + out: TestExceptions - Doc root 'EXCEPS' not found in the DOM graph! Found '#comment' instead. 13 Finished running TestExceptions: 0 at tests.MainTest.compareReferenceFiles(MainTest.java:542) at org.netbeans.junit.NbTestCase.compareReferenceFiles(NbTestCase.java:1272) at tests.MainTest.tearDown(MainTest.java:512) at org.netbeans.junit.NbTestCase.runBare(NbTestCase.java:500) at org.netbeans.junit.NbTestCase.run(NbTestCase.java:275) ``` If I remove the license header of `schema2beans/test/unit/data/TestExceptions.xml`, `testExeptions` succeeds. If you cannot reproduce this, something may be wrong with my environment. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          535. junichi11 commented on issue #178: [NETBEANS-54] Module Review schema2beans URL: https://github.com/apache/incubator-netbeans/pull/178#issuecomment-338620579 In my environment, Before: 24 tests succeed, 8 tests fail After: 16 tests succeed, 16 tests fail So, perhaps, there are problems in some schema2beans/test/unit/data files. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          536. vieiro commented on issue #172: [NETBEANS-54] Module Review o.apache.xml.resolver URL: https://github.com/apache/incubator-netbeans/pull/172#issuecomment-338665582 Mmm... I think this is a very simple use case that just compiles a jar file, not enough for a generalization?. I think (I'm not sure) there're other use cases where you need to download several (hopefully binary) jar files in order to be able to compile the patched sources. Maybe we want to explore that use case before making a generalization. Cheers, Antonio 2017-10-23 14:56 GMT+02:00 Jaroslav Tulach <notifications@github.com>: > *@JaroslavTulach* commented on this pull request. > ------------------------------ > > In o.apache.xml.resolver/build.xml > <https://github.com/apache/incubator-netbeans/pull/172#discussion_r146254955> > : > > > + <!-- ... 2. Unzips maven sources --> > + <unzip src="external/xml-resolver-1.2-sources.jar" dest="build/external-patch/sources" /> > + <!-- ... 3. Applies patch 'external/xml-resolver-1.2-netbeans.patch --> > + <patch dir="build/external-patch/sources" > + patchfile="external/xml-resolver-1.2-netbeans.patch" > + strip="0" /> > + <!-- ... 4. Compiles sources to build/external-patch/classes --> > + <mkdir dir="build/external-patch/classes" /> > + <javac srcdir="build/external-patch/sources" > + destdir="build/external-patch/classes" > > + <exclude name="org/apache/xml/resolver/tests/**" /> > + </javac> > + <!-- ... 5. Creates a jar in 'external/resolver-1.2.jar' --> > + <jar destfile="external/resolver-1.2.jar"> > + <fileset dir="build/external-patch/classes" /> > + </jar> > > Looks like a clean way to solve the need for patches. Should this be more > common, it would be good to move most of the script into projectized.xml > and just configure it with properties from nbproject/project.properties. > > — > You are receiving this because you authored the thread. > Reply to this email directly, view it on GitHub > <https://github.com/apache/incubator-netbeans/pull/172#pullrequestreview-71169114>, > or mute the thread > <https://github.com/notifications/unsubscribe-auth/AAibrCchrJZIh4Nw36ScFaSlvwjsT_hFks5svIzmgaJpZM4QBo_-> > . > ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          537. geertjanw commented on issue #178: [NETBEANS-54] Module Review schema2beans URL: https://github.com/apache/incubator-netbeans/pull/178#issuecomment-338707204 It seems to me that these are all "test data for which the addition of a source header would cause the tests to fail" -- i.e., these do not require a license header (https://www.apache.org/legal/src-headers.html). I think these should be included in the Rat report exclusions. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          538. junichi11 commented on issue #178: [NETBEANS-54] Module Review schema2beans URL: https://github.com/apache/incubator-netbeans/pull/178#issuecomment-338710036 I also think so. Test data are already excluded in some modules because tests fail, probably. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          539. struberg commented on issue #178: [NETBEANS-54] Module Review schema2beans URL: https://github.com/apache/incubator-netbeans/pull/178#issuecomment-338711153 Or fix the test or the tested code to be ok with that header? ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          540. geertjanw commented on issue #178: [NETBEANS-54] Module Review schema2beans URL: https://github.com/apache/incubator-netbeans/pull/178#issuecomment-338715094 I would suggest not for the first incubator release of Apache NetBeans (incubating). I.e., for the first release, I propose we handle these via Rat exclusions, we create an issue to document the need for this to be solved in a better way, and leave it at that for the moment. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          541. struberg commented on issue #178: [NETBEANS-54] Module Review schema2beans URL: https://github.com/apache/incubator-netbeans/pull/178#issuecomment-338715597 perfectly fine for me. Do we want to create a low-prio ticket for it so we can better track it? ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          542. matthiasblaesing opened a new pull request #181: [NETBEANS-54] Module Review libs.osgi (followup) URL: https://github.com/apache/incubator-netbeans/pull/181 Maven central does not hold the original netbeans artifact osgi.cmpn-4.2, but a superset of that: <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.compendium</artifactId> <version>4.2.0</version> </dependency> That artifact holds not only the compiled binaries, but also the java sources in a subfolder "OSGI-OPT". To get the original netbeans file, the jar is repacked and the folder is stripped. The resulting zip is not identical to the original binary, but the difference is in the zip structure, after expanding the original contents and the new file are identical. This PR is a followup for #104 which introduced a maven coordinate, that can't be satisfied from maven central. There are newer osgi compendium jar on maven central and it looks as if at least 4.3.1 would also work, but updating libraries should be a separate task from this cleanup task. This approach was inspired by @vieiro who first came up with building modified binaries for maven sources. @geertjanw could you please have a look at this and see if it works for you? ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          543. vieiro commented on issue #175: [NETBEANS-54] Module Review extexecution.process (patch) URL: https://github.com/apache/incubator-netbeans/pull/175#issuecomment-338864765 Thanks, Matthias, for your review! :-) ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          544. junichi11 commented on issue #153: [NETBEANS-54] Module Review maven.osgi URL: https://github.com/apache/incubator-netbeans/pull/153#issuecomment-338873970 I'll close this. see https://github.com/emilianbold/incubator-netbeans/pull/325 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          545. junichi11 closed pull request #153: [NETBEANS-54] Module Review maven.osgi URL: https://github.com/apache/incubator-netbeans/pull/153 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/maven.osgi/src/org/netbeans/modules/maven/osgi/templates/Activator.java.template b/maven.osgi/src/org/netbeans/modules/maven/osgi/templates/Activator.java.template index d4ffb792a..b90213562 100644 --- a/maven.osgi/src/org/netbeans/modules/maven/osgi/templates/Activator.java.template +++ b/maven.osgi/src/org/netbeans/modules/maven/osgi/templates/Activator.java.template @@ -1,3 +1,24 @@ +<#-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> + <#-- FreeMarker template (see http://freemarker.org/) --> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          546. junichi11 commented on issue #163: [NETBEANS-54] Module Review maven.indexer URL: https://github.com/apache/incubator-netbeans/pull/163#issuecomment-338887894 I've sorted rat excludes. (This PR already had the conflicting file(nbbuild/build.xml)) ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          547. arusinha commented on issue #169: [NETBEANS-54] Module Review o.apache.commons.httpclient URL: https://github.com/apache/incubator-netbeans/pull/169#issuecomment-338889206 Has corrected now usename , email-id with a force push ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          548. bolsover commented on issue #172: [NETBEANS-54] Module Review o.apache.xml.resolver URL: https://github.com/apache/incubator-netbeans/pull/172#issuecomment-338919992 Having problems with this.. Build is failing with message: -prepare-patched-binary: [echo] Patching xml-resolver-1.2-sources.jar for Netbeans... [mkdir] Created dir: D:\incubator-netbeans\o.apache.xml.resolver\build\external-patch\sources [unzip] Expanding: D:\incubator-netbeans\o.apache.xml.resolver\external\xml-resolver-1.2-sources.jar into D:\incubator-netbeans\o.apache.xml.resolver\build\external-patch\sources [nbmerge] Failed to build target: all-o.apache.xml.resolver BUILD FAILED D:\incubator-netbeans\nbbuild\build.xml:425: The following error occurred while executing this line: D:\incubator-netbeans\nbbuild\build.xml:420: The following error occurred while executing this line: D:\incubator-netbeans\nbbuild\build.xml:467: The following error occurred while executing this line: D:\incubator-netbeans\o.apache.xml.resolver\build.xml:47: java.io.IOException: Cannot run program "patch" (in directory "D:\incubator-netbeans\o.apache.xml.resolver\build\external-patch\sources"): CreateProcess error=2, The system cannot find the file specified at java.lang.ProcessBuilder.start(ProcessBuilder.java:1048) at java.lang.Runtime.exec(Runtime.java:620) ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          549. arusinha opened a new pull request #184: [NETBEANS-54] Module Review net.java.html.geo URL: https://github.com/apache/incubator-netbeans/pull/184 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          550. arusinha opened a new pull request #185: [NETBEANS-54] Module Review net.java.html.boot.script URL: https://github.com/apache/incubator-netbeans/pull/185 Added license file for external resource net.java.html.boot.script-1.4.jar ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          551. arusinha opened a new pull request #186: [NETBEANS-54] Module Review net.java.html.boot.fx URL: https://github.com/apache/incubator-netbeans/pull/186 Added license file for external resource net.java.html.boot.fx-1.4.jar ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          552. geertjanw opened a new pull request #187: [NETBEANS-54] adding schema2beans test data to Rat exceptions URL: https://github.com/apache/incubator-netbeans/pull/187 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          553. arusinha opened a new pull request #188: [NETBEANS-54] Module Review net.java.html.boot URL: https://github.com/apache/incubator-netbeans/pull/188 Added license file for external resource net.java.html.boot-1.4.jar ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          554. vieiro commented on issue #172: [NETBEANS-54] Module Review o.apache.xml.resolver URL: https://github.com/apache/incubator-netbeans/pull/172#issuecomment-338942929 You need a command-line "patch" program. I'm not sure how to install int in Windows (I don't use Windows myself). This opens an interesting issue. if we want to patch sources then we need the "patch" command line program, i.e., we now depend on the "patch" program. Are we ready for this dependency? 2017-10-24 10:49 GMT+02:00 David Bolsover <notifications@github.com>: > Having problems with this.. > > Build is failing with message: > > -prepare-patched-binary: > [echo] Patching xml-resolver-1.2-sources.jar for Netbeans... > [mkdir] Created dir: D:\incubator-netbeans\o.apache.xml.resolver\build\ > external-patch\sources > [unzip] Expanding: D:\incubator-netbeans\o.apache.xml.resolver\external\xml-resolver-1.2-sources.jar > into D:\incubator-netbeans\o.apache.xml.resolver\build\ > external-patch\sources > [nbmerge] Failed to build target: all-o.apache.xml.resolver > > BUILD FAILED > D:\incubator-netbeans\nbbuild\build.xml:425: The following error occurred > while executing this line: > D:\incubator-netbeans\nbbuild\build.xml:420: The following error occurred > while executing this line: > D:\incubator-netbeans\nbbuild\build.xml:467: The following error occurred > while executing this line: > D:\incubator-netbeans\o.apache.xml.resolver\build.xml:47: > java.io.IOException: Cannot run program "patch" (in directory > "D:\incubator-netbeans\o.apache.xml.resolver\build\external-patch\sources"): > CreateProcess error=2, The system cannot find the file specified > at java.lang.ProcessBuilder.start(ProcessBuilder.java:1048) > at java.lang.Runtime.exec(Runtime.java:620) > > — > You are receiving this because you authored the thread. > Reply to this email directly, view it on GitHub > <https://github.com/apache/incubator-netbeans/pull/172#issuecomment-338919992>, > or mute the thread > <https://github.com/notifications/unsubscribe-auth/AAibrHIyIHCFWMfT8w7EejsDbGjXId6Oks5svaSMgaJpZM4QBo_-> > . > ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          555. vikasprabhakar opened a new pull request #189: [NETBEANS-54] Module Review web.browser.api URL: https://github.com/apache/incubator-netbeans/pull/189 Added license header for webpreview.wsmode ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          556. geertjanw commented on issue #180: [NETBEANS-54] Module Review java.hints.declarative URL: https://github.com/apache/incubator-netbeans/pull/180#issuecomment-338952650 Discussed on the mailing list in the thread "Review of java.hints.declarative". Please someone review and approve and merge this one. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          557. jlahoda commented on issue #183: [NETBEANS-54] Module Review net.java.html URL: https://github.com/apache/incubator-netbeans/pull/183#issuecomment-338953182 I am sorry, but Jarda sent a pull request this morning changing the Html4J binaries for version 1.5, which is Apache licensed. I am also prototyping a change that is adding the Apache licenses with the appropriate headers, so the licenses are accounted properly. So my suggestion would be not to add this license file. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          558. arusinha commented on issue #183: [NETBEANS-54] Module Review net.java.html URL: https://github.com/apache/incubator-netbeans/pull/183#issuecomment-338957738 Closing the pull request as Jan Lahoda will work on the same ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          559. arusinha closed pull request #183: [NETBEANS-54] Module Review net.java.html URL: https://github.com/apache/incubator-netbeans/pull/183 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/net.java.html/external/net.java.html-1.4-license.txt b/net.java.html/external/net.java.html-1.4-license.txt new file mode 100644 index 000000000..3ea3c261f --- /dev/null +++ b/net.java.html/external/net.java.html-1.4-license.txt @@ -0,0 +1,827 @@ + +COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 + +1. Definitions. + +1.1. "Contributor" means each individual or entity that +creates or contributes to the creation of Modifications. + +1.2. "Contributor Version" means the combination of the +Original Software, prior Modifications used by a +Contributor (if any), and the Modifications made by that +particular Contributor. + +1.3. "Covered Software" means (a) the Original Software, or +(b) Modifications, or (c) the combination of files +containing Original Software with files containing +Modifications, in each case including portions thereof. + +1.4. "Executable" means the Covered Software in any form +other than Source Code. + +1.5. "Initial Developer" means the individual or entity +that first makes Original Software available under this +License. + +1.6. "Larger Work" means a work which combines Covered +Software or portions thereof with code not governed by the +terms of this License. + +1.7. "License" means this document. + +1.8. "Licensable" means having the right to grant, to the +maximum extent possible, whether at the time of the initial +grant or subsequently acquired, any and all of the rights +conveyed herein. + +1.9. "Modifications" means the Source Code and Executable +form of any of the following: + +A. Any file that results from an addition to, +deletion from or modification of the contents of a +file containing Original Software or previous +Modifications; + +B. Any new file that contains any part of the +Original Software or previous Modification; or + +C. Any new file that is contributed or otherwise made +available under the terms of this License. + +1.10. "Original Software" means the Source Code and +Executable form of computer software code that is +originally released under this License. + +1.11. "Patent Claims" means any patent claim(s), now owned +or hereafter acquired, including without limitation, +method, process, and apparatus claims, in any patent +Licensable by grantor. + +1.12. "Source Code" means (a) the common form of computer +software code in which modifications are made and (b) +associated documentation included in or with such code. + +1.13. "You" (or "Your") means an individual or a legal +entity exercising rights under, and complying with all of +the terms of, this License. For legal entities, "You" +includes any entity which controls, is controlled by, or is +under common control with You. For purposes of this +definition, "control" means (a) the power, direct or +indirect, to cause the direction or management of such +entity, whether by contract or otherwise, or (b) ownership +of more than fifty percent (50%) of the outstanding shares +or beneficial ownership of such entity. + +2. License Grants. + +2.1. The Initial Developer Grant. + +Conditioned upon Your compliance with Section 3.1 below and +subject to third party intellectual property claims, the +Initial Developer hereby grants You a world-wide, +royalty-free, non-exclusive license: + +(a) under intellectual property rights (other than +patent or trademark) Licensable by Initial Developer, +to use, reproduce, modify, display, perform, +sublicense and distribute the Original Software (or +portions thereof), with or without Modifications, +and/or as part of a Larger Work; and + +(b) under Patent Claims infringed by the making, +using or selling of Original Software, to make, have +made, use, practice, sell, and offer for sale, and/or +otherwise dispose of the Original Software (or +portions thereof). + +(c) The licenses granted in Sections 2.1(a) and (b) +are effective on the date Initial Developer first +distributes or otherwise makes the Original Software +available to a third party under the terms of this +License. + +(d) Notwithstanding Section 2.1(b) above, no patent +license is granted: (1) for code that You delete from +the Original Software, or (2) for infringements +caused by: (i) the modification of the Original +Software, or (ii) the combination of the Original +Software with other software or devices. + +2.2. Contributor Grant. + +Conditioned upon Your compliance with Section 3.1 below and +subject to third party intellectual property claims, each +Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +(a) under intellectual property rights (other than +patent or trademark) Licensable by Contributor to +use, reproduce, modify, display, perform, sublicense +and distribute the Modifications created by such +Contributor (or portions thereof), either on an +unmodified basis, with other Modifications, as +Covered Software and/or as part of a Larger Work; and + +(b) under Patent Claims infringed by the making, +using, or selling of Modifications made by that +Contributor either alone and/or in combination with +its Contributor Version (or portions of such +combination), to make, use, sell, offer for sale, +have made, and/or otherwise dispose of: (1) +Modifications made by that Contributor (or portions +thereof); and (2) the combination of Modifications +made by that Contributor with its Contributor Version +(or portions of such combination). + +(c) The licenses granted in Sections 2.2(a) and +2.2(b) are effective on the date Contributor first +distributes or otherwise makes the Modifications +available to a third party. + +(d) Notwithstanding Section 2.2(b) above, no patent +license is granted: (1) for any code that Contributor +has deleted from the Contributor Version; (2) for +infringements caused by: (i) third party +modifications of Contributor Version, or (ii) the +combination of Modifications made by that Contributor +with other software (except as part of the +Contributor Version) or other devices; or (3) under +Patent Claims infringed by Covered Software in the +absence of Modifications made by that Contributor. + +3. Distribution Obligations. + +3.1. Availability of Source Code. + +Any Covered Software that You distribute or otherwise make +available in Executable form must also be made available in +Source Code form and that Source Code form must be +distributed only under the terms of this License. You must +include a copy of this License with every copy of the +Source Code form of the Covered Software You distribute or +otherwise make available. You must inform recipients of any +such Covered Software in Executable form as to how they can +obtain such Covered Software in Source Code form in a +reasonable manner on or through a medium customarily used +for software exchange. + +3.2. Modifications. + +The Modifications that You create or to which You +contribute are governed by the terms of this License. You +represent that You believe Your Modifications are Your +original creation(s) and/or You have sufficient rights to +grant the rights conveyed by this License. + +3.3. Required Notices. + +You must include a notice in each of Your Modifications +that identifies You as the Contributor of the Modification. +You may not remove or alter any copyright, patent or +trademark notices contained within the Covered Software, or +any notices of licensing or any descriptive text giving +attribution to any Contributor or the Initial Developer. + +3.4. Application of Additional Terms. + +You may not offer or impose any terms on any Covered +Software in Source Code form that alters or restricts the +applicable version of this License or the recipients' +rights hereunder. You may choose to offer, and to charge a +fee for, warranty, support, indemnity or liability +obligations to one or more recipients of Covered Software. +However, you may do so only on Your own behalf, and not on +behalf of the Initial Developer or any Contributor. You +must make it absolutely clear that any such warranty, +support, indemnity or liability obligation is offered by +You alone, and You hereby agree to indemnify the Initial +Developer and every Contributor for any liability incurred +by the Initial Developer or such Contributor as a result of +warranty, support, indemnity or liability terms You offer. + +3.5. Distribution of Executable Versions. + +You may distribute the Executable form of the Covered +Software under the terms of this License or under the terms +of a license of Your choice, which may contain terms +different from this License, provided that You are in +compliance with the terms of this License and that the +license for the Executable form does not attempt to limit +or alter the recipient's rights in the Source Code form +from the rights set forth in this License. If You +distribute the Covered Software in Executable form under a +different license, You must make it absolutely clear that +any terms which differ from this License are offered by You +alone, not by the Initial Developer or Contributor. You +hereby agree to indemnify the Initial Developer and every +Contributor for any liability incurred by the Initial +Developer or such Contributor as a result of any such terms +You offer. + +3.6. Larger Works. + +You may create a Larger Work by combining Covered Software +with other code not governed by the terms of this License +and distribute the Larger Work as a single product. In such +a case, You must make sure the requirements of this License +are fulfilled for the Covered Software. + +4. Versions of the License. + +4.1. New Versions. + +Sun Microsystems, Inc. is the initial license steward and +may publish revised and/or new versions of this License +from time to time. Each version will be given a +distinguishing version number. Except as provided in +Section 4.3, no one other than the license steward has the +right to modify this License. + +4.2. Effect of New Versions. + +You may always continue to use, distribute or otherwise +make the Covered Software available under the terms of the +version of the License under which You originally received +the Covered Software. If the Initial Developer includes a +notice in the Original Software prohibiting it from being +distributed or otherwise made available under any +subsequent version of the License, You must distribute and +make the Covered Software available under the terms of the +version of the License under which You originally received +the Covered Software. Otherwise, You may also choose to +use, distribute or otherwise make the Covered Software +available under the terms of any subsequent version of the +License published by the license steward. + +4.3. Modified Versions. + +When You are an Initial Developer and You want to create a +new license for Your Original Software, You may create and +use a modified version of this License if You: (a) rename +the license and remove any references to the name of the +license steward (except to note that the license differs +from this License); and (b) otherwise make it clear that +the license contains terms which differ from this License. + +5. DISCLAIMER OF WARRANTY. + +COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" +BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, +INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED +SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR +PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND +PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY +COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE +INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF +ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF +WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF +ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS +DISCLAIMER. + +6. TERMINATION. + +6.1. This License and the rights granted hereunder will +terminate automatically if You fail to comply with terms +herein and fail to cure such breach within 30 days of +becoming aware of the breach. Provisions which, by their +nature, must remain in effect beyond the termination of +this License shall survive. + +6.2. If You assert a patent infringement claim (excluding +declaratory judgment actions) against Initial Developer or +a Contributor (the Initial Developer or Contributor against +whom You assert such claim is referred to as "Participant") +alleging that the Participant Software (meaning the +Contributor Version where the Participant is a Contributor +or the Original Software where the Participant is the +Initial Developer) directly or indirectly infringes any +patent, then any and all rights granted directly or +indirectly to You by such Participant, the Initial +Developer (if the Initial Developer is not the Participant) +and all Contributors under Sections 2.1 and/or 2.2 of this +License shall, upon 60 days notice from Participant +terminate prospectively and automatically at the expiration +of such 60 day notice period, unless if within such 60 day +period You withdraw Your claim with respect to the +Participant Software against such Participant either +unilaterally or pursuant to a written agreement with +Participant. + +6.3. If You assert a patent infringement claim against +Participant alleging that the Participant Software directly +or indirectly infringes any patent where such claim is +resolved (such as by license or settlement) prior to the +initiation of patent infringement litigation, then the +reasonable value of the licenses granted by such Participant +under Sections 2.1 or 2.2 shall be taken into account in +determining the amount or value of any payment or license. + +6.4. In the event of termination under Sections 6.1 or 6.2 +above, all end user licenses that have been validly granted +by You or any distributor hereunder prior to termination +(excluding licenses granted to You by any distributor) +shall survive termination. + +7. LIMITATION OF LIABILITY. + +UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT +(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE +INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF +COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE +LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR +CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT +LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK +STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER +COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN +INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF +LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL +INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT +APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO +NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR +CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT +APPLY TO YOU. + +8. U.S. GOVERNMENT END USERS. + +The Covered Software is a "commercial item," as that term is +defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial +computer software" (as that term is defined at 48 C.F.R. +ยง 252.227-7014(a)(1)) and "commercial computer software +documentation" as such terms are used in 48 C.F.R. 12.212 (Sept. +1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 +through 227.7202-4 (June 1995), all U.S. Government End Users +acquire Covered Software with only those rights set forth herein. +This U.S. Government Rights clause is in lieu of, and supersedes, +any other FAR, DFAR, or other clause or provision that addresses +Government rights in computer software under this License. + +9. MISCELLANEOUS. + +This License represents the complete agreement concerning subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the +extent necessary to make it enforceable. This License shall be +governed by the law of the jurisdiction specified in a notice +contained within the Original Software (except to the extent +applicable law, if any, provides otherwise), excluding such +jurisdiction's conflict-of-law provisions. Any litigation +relating to this License shall be subject to the jurisdiction of +the courts located in the jurisdiction and venue specified in a +notice contained within the Original Software, with the losing +party responsible for costs, including, without limitation, court +costs and reasonable attorneys' fees and expenses. The +application of the United Nations Convention on Contracts for the +International Sale of Goods is expressly excluded. Any law or +regulation which provides that the language of a contract shall +be construed against the drafter shall not apply to this License. +You agree that You alone are responsible for compliance with the +United States export administration regulations (and the export +control laws and regulation of any other countries) when You use, +distribute or otherwise make available any Covered Software. + +10. RESPONSIBILITY FOR CLAIMS. + +As between Initial Developer and the Contributors, each party is +responsible for claims and damages arising, directly or +indirectly, out of its utilization of rights under this License +and You agree to work with Initial Developer and Contributors to +distribute such responsibility on an equitable basis. Nothing +herein is intended or shall be deemed to constitute any admission +of liability. + +NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND +DISTRIBUTION LICENSE (CDDL) + +The code released under the CDDL shall be governed by the laws +of the State of California (excluding conflict-of-law provisions). +Any litigation relating to this License shall be subject to the +jurisdiction of the Federal Courts of the Northern District of +California and the state courts of the State of California, with +venue lying in Santa Clara County, California. + + +The GNU General Public License (GPL) +Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim + copies of this license document, but changing it is not + allowed. + + Preamble + +The licenses for most software are designed to take away +your freedom to share and change it. By contrast, the GNU +General Public License is intended to guarantee your freedom +to share and change free software--to make sure the software +is free for all its users. This General Public License +applies to most of the Free Software Foundation's software +and to any other program whose authors commit to using it. +(Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can +apply it to your programs, too. + +When we speak of free software, we are referring to freedom, +not price. Our General Public Licenses are designed to make +sure that you have the freedom to distribute copies of free +software (and charge for this service if you wish), that you +receive source code or can get it if you want it, that you +can change the software or use pieces of it in new free +programs; and that you know you can do these things. + +To protect your rights, we need to make restrictions that +forbid anyone to deny you these rights or to ask you to +surrender the rights. These restrictions translate to +certain responsibilities for you if you distribute copies of +the software, or if you modify it. + +For example, if you distribute copies of such a program, +whether gratis or for a fee, you must give the recipients +all the rights that you have. You must make sure that they, +too, receive or can get the source code. And you must show +them these terms so they know their rights. + +We protect your rights with two steps: (1) copyright the +software, and (2) offer you this license which gives you +legal permission to copy, distribute and/or modify the +software. + +Also, for each author's protection and ours, we want to make +certain that everyone understands that there is no warranty +for this free software. If the software is modified by +someone else and passed on, we want its recipients to know +that what they have is not the original, so that any +problems introduced by others will not reflect on the +original authors' reputations. + +Finally, any free program is threatened constantly by +software patents. We wish to avoid the danger that +redistributors of a free program will individually obtain +patent licenses, in effect making the program proprietary. +To prevent this, we have made it clear that any patent must +be licensed for everyone's free use or not licensed at all. + +The precise terms and conditions for copying, distribution +and modification follow. + +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND +MODIFICATION + +0. This License applies to any program or other work which +contains a notice placed by the copyright holder saying it +may be distributed under the terms of this General Public +License. The "Program", below, refers to any such program or +work, and a "work based on the Program" means either the +Program or any derivative work under copyright law: that is +to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into +another language. (Hereinafter, translation is included +without limitation in the term "modification".) Each +licensee is addressed as "you". + +Activities other than copying, distribution and modification +are not covered by this License; they are outside its scope. +The act of running the Program is not restricted, and the +output from the Program is covered only if its contents +constitute a work based on the Program (independent of +having been made by running the Program). Whether that is +true depends on what the Program does. + +1. You may copy and distribute verbatim copies of the +Program's source code as you receive it, in any medium, +provided that you conspicuously and appropriately publish on +each copy an appropriate copyright notice and disclaimer of +warranty; keep intact all the notices that refer to this +License and to the absence of any warranty; and give any +other recipients of the Program a copy of this License along +with the Program. + +You may charge a fee for the physical act of transferring a +copy, and you may at your option offer warranty protection +in exchange for a fee. + +2. You may modify your copy or copies of the Program or any +portion of it, thus forming a work based on the Program, and +copy and distribute such modifications or work under the +terms of Section 1 above, provided that you also meet all of +these conditions: + + a) You must cause the modified files to carry prominent + notices stating that you changed the files and the date + of any change. + + b) You must cause any work that you distribute or + publish, that in whole or in part contains or is derived + from the Program or any part thereof, to be licensed as + a whole at no charge to all third parties under the + terms of this License. + + c) If the modified program normally reads commands + interactively when run, you must cause it, when started + running for such interactive use in the most ordinary + way, to print or display an announcement including an + appropriate copyright notice and a notice that there is + no warranty (or else, saying that you provide a + warranty) and that users may redistribute the program + under these conditions, and telling the user how to view + a copy of this License. (Exception: if the Program + itself is interactive but does not normally print such + an announcement, your work based on the Program is not + required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the +Program, and can be reasonably considered independent and +separate works in themselves, then this License, and its +terms, do not apply to those sections when you distribute +them as separate works. But when you distribute the same +sections as part of a whole which is a work based on the +Program, the distribution of the whole must be on the terms +of this License, whose permissions for other licensees +extend to the entire whole, and thus to each and every part +regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights +or contest your rights to work written entirely by you; +rather, the intent is to exercise the right to control the +distribution of derivative or collective works based on the +Program. + +In addition, mere aggregation of another work not based on +the Program with the Program (or with a work based on the +Program) on a volume of a storage or distribution medium +does not bring the other work under the scope of this +License. + +3. You may copy and distribute the Program (or a work based +on it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you +also do one of the following: + + a) Accompany it with the complete corresponding + machine-readable source code, which must be distributed + under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least + three years, to give any third party, for a charge no + more than your cost of physically performing source + distribution, a complete machine-readable copy of the + corresponding source code, to be distributed under the + terms of Sections 1 and 2 above on a medium customarily + used for software interchange; or, + + c) Accompany it with the information you received as to + the offer to distribute corresponding source code. (This + alternative is allowed only for noncommercial + distribution and only if you received the program in + object code or executable form with such an offer, in + accord with Subsection b above.) + +The source code for a work means the preferred form of the +work for making modifications to it. For an executable work, +complete source code means all the source code for all +modules it contains, plus any associated interface +definition files, plus the scripts used to control +compilation and installation of the executable. However, as +a special exception, the source code distributed need not +include anything that is normally distributed (in either +source or binary form) with the major components (compiler, +kernel, and so on) of the operating system on which the +executable runs, unless that component itself accompanies +the executable. + +If distribution of executable or object code is made by +offering access to copy from a designated place, then +offering equivalent access to copy the source code from the +same place counts as distribution of the source code, even +though third parties are not compelled to copy the source +along with the object code. + +4. You may not copy, modify, sublicense, or distribute the +Program except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense or distribute +the Program is void, and will automatically terminate your +rights under this License. However, parties who have +received copies, or rights, from you under this License will +not have their licenses terminated so long as such parties +remain in full compliance. + +5. You are not required to accept this License, since you +have not signed it. However, nothing else grants you +permission to modify or distribute the Program or its +derivative works. These actions are prohibited by law if you +do not accept this License. Therefore, by modifying or +distributing the Program (or any work based on the Program), +you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or +modifying the Program or works based on it. + +6. Each time you redistribute the Program (or any work based +on the Program), the recipient automatically receives a +license from the original licensor to copy, distribute or +modify the Program subject to these terms and conditions. +You may not impose any further restrictions on the +recipients' exercise of the rights granted herein. You are +not responsible for enforcing compliance by third parties to +this License. + +7. If, as a consequence of a court judgment or allegation of +patent infringement or for any other reason (not limited to +patent issues), conditions are imposed on you (whether by +court order, agreement or otherwise) that contradict the +conditions of this License, they do not excuse you from the +conditions of this License. If you cannot distribute so as +to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a +consequence you may not distribute the Program at all. For +example, if a patent license would not permit royalty-free +redistribution of the Program by all those who receive +copies directly or indirectly through you, then the only way +you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or +unenforceable under any particular circumstance, the balance +of the section is intended to apply and the section as a +whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to +infringe any patents or other property right claims or to +contest validity of any such claims; this section has the +sole purpose of protecting the integrity of the free +software distribution system, which is implemented by public +license practices. Many people have made generous +contributions to the wide range of software distributed +through that system in reliance on consistent application of +that system; it is up to the author/donor to decide if he or +she is willing to distribute software through any other +system and a licensee cannot impose that choice. + +This section is intended to make thoroughly clear what is +believed to be a consequence of the rest of this License. + +8. If the distribution and/or use of the Program is +restricted in certain countries either by patents or by +copyrighted interfaces, the original copyright holder who +places the Program under this License may add an explicit +geographical distribution limitation excluding those +countries, so that distribution is permitted only in or +among countries not thus excluded. In such case, this +License incorporates the limitation as if written in the +body of this License. + +9. The Free Software Foundation may publish revised and/or +new versions of the General Public License from time to +time. Such new versions will be similar in spirit to the +present version, but may differ in detail to address new +problems or concerns. + +Each version is given a distinguishing version number. If +the Program specifies a version number of this License which +applies to it and "any later version", you have the option +of following the terms and conditions either of that version +or of any later version published by the Free Software +Foundation. If the Program does not specify a version number +of this License, you may choose any version ever published +by the Free Software Foundation. + +10. If you wish to incorporate parts of the Program into +other free programs whose distribution conditions are +different, write to the author to ask for permission. For +software which is copyrighted by the Free Software +Foundation, write to the Free Software Foundation; we +sometimes make exceptions for this. Our decision will be +guided by the two goals of preserving the free status of all +derivatives of our free software and of promoting the +sharing and reuse of software generally. + +NO WARRANTY + +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS +NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE +COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM +"AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR +IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE +OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE +DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + +12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED +TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY +WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED +ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, +SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF +THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT +LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR +LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE +PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH +HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + +If you develop a new program, and you want it to be of the +greatest possible use to the public, the best way to achieve +this is to make it free software which everyone can +redistribute and change under these terms. + +To do so, attach the following notices to the program. It is +safest to attach them to the start of each source file to +most effectively convey the exclusion of warranty; and each +file should have at least the "copyright" line and a pointer +to where the full notice is found. + + One line to give the program's name and a brief idea of + what it does. Copyright (C) <year> <name of author> + + This program is free software; you can redistribute it + and/or modify it under the terms of the GNU General + Public License as published by the Free Software + Foundation; either version 2 of the License, or (at your + option) any later version. + + This program is distributed in the hope that it will be + useful, but WITHOUT ANY WARRANTY; without even the + implied warranty of MERCHANTABILITY or FITNESS FOR A + PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General + Public License along with this program; if not, write to + the Free Software Foundation, Inc., 59 Temple Place, + Suite 330, Boston, MA 02111-1307 USA + +Also add information on how to contact you by electronic and +paper mail. + +If the program is interactive, make it output a short notice +like this when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of + author Gnomovision comes with ABSOLUTELY NO WARRANTY; + for details type `show w'. This is free software, and + you are welcome to redistribute it under certain + conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show +the appropriate parts of the General Public License. Of +course, the commands you use may be called something other +than `show w' and `show c'; they could even be mouse-clicks +or menu items--whatever suits your program. + +You should also get your employer (if you work as a +programmer) or your school, if any, to sign a "copyright +disclaimer" for the program, if necessary. Here is a sample; +alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in + the program `Gnomovision' (which makes passes at + compilers) written by James Hacker. + + signature of Ty Coon, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating +your program into proprietary programs. If your program is a +subroutine library, you may consider it more useful to +permit linking proprietary applications with the library. If +this is what you want to do, use the GNU Library General +Public License instead of this License. + + +"CLASSPATH" EXCEPTION TO THE GPL VERSION 2 + + +Certain source files distributed by Sun Microsystems, Inc. +are subject to the following clarification and special +exception to the GPL Version 2, but only where Sun has expressly +included in the particular source file's header the words +"Sun designates this particular file as subject to the +"Classpath" exception as provided by Sun in the License file +that accompanied this code." + +Linking this library statically or dynamically with other +modules is making a combined work based on this library. +Thus, the terms and conditions of the GNU General Public +License Version 2 cover the whole combination. + +As a special exception, the copyright holders of this +library give you permission to link this library with +independent modules to produce an executable, regardless of +the license terms of these independent modules, and to copy +and distribute the resulting executable under terms of your +choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license +of that module. An independent module is a module which is +not derived from or based on this library. If you modify +this library, you may extend this exception to your version +of the library, but you are not obligated to do so. If you +do not wish to do so, delete this exception statement from +your version. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          560. arusinha commented on issue #184: [NETBEANS-54] Module Review net.java.html.geo URL: https://github.com/apache/incubator-netbeans/pull/184#issuecomment-338957833 Closing the pull request as Jan Lahoda will work on the same ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          561. arusinha closed pull request #184: [NETBEANS-54] Module Review net.java.html.geo URL: https://github.com/apache/incubator-netbeans/pull/184 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/net.java.html.geo/external/net.java.html.geo-1.4-license.txt b/net.java.html.geo/external/net.java.html.geo-1.4-license.txt new file mode 100644 index 000000000..3ea3c261f --- /dev/null +++ b/net.java.html.geo/external/net.java.html.geo-1.4-license.txt @@ -0,0 +1,827 @@ + +COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 + +1. Definitions. + +1.1. "Contributor" means each individual or entity that +creates or contributes to the creation of Modifications. + +1.2. "Contributor Version" means the combination of the +Original Software, prior Modifications used by a +Contributor (if any), and the Modifications made by that +particular Contributor. + +1.3. "Covered Software" means (a) the Original Software, or +(b) Modifications, or (c) the combination of files +containing Original Software with files containing +Modifications, in each case including portions thereof. + +1.4. "Executable" means the Covered Software in any form +other than Source Code. + +1.5. "Initial Developer" means the individual or entity +that first makes Original Software available under this +License. + +1.6. "Larger Work" means a work which combines Covered +Software or portions thereof with code not governed by the +terms of this License. + +1.7. "License" means this document. + +1.8. "Licensable" means having the right to grant, to the +maximum extent possible, whether at the time of the initial +grant or subsequently acquired, any and all of the rights +conveyed herein. + +1.9. "Modifications" means the Source Code and Executable +form of any of the following: + +A. Any file that results from an addition to, +deletion from or modification of the contents of a +file containing Original Software or previous +Modifications; + +B. Any new file that contains any part of the +Original Software or previous Modification; or + +C. Any new file that is contributed or otherwise made +available under the terms of this License. + +1.10. "Original Software" means the Source Code and +Executable form of computer software code that is +originally released under this License. + +1.11. "Patent Claims" means any patent claim(s), now owned +or hereafter acquired, including without limitation, +method, process, and apparatus claims, in any patent +Licensable by grantor. + +1.12. "Source Code" means (a) the common form of computer +software code in which modifications are made and (b) +associated documentation included in or with such code. + +1.13. "You" (or "Your") means an individual or a legal +entity exercising rights under, and complying with all of +the terms of, this License. For legal entities, "You" +includes any entity which controls, is controlled by, or is +under common control with You. For purposes of this +definition, "control" means (a) the power, direct or +indirect, to cause the direction or management of such +entity, whether by contract or otherwise, or (b) ownership +of more than fifty percent (50%) of the outstanding shares +or beneficial ownership of such entity. + +2. License Grants. + +2.1. The Initial Developer Grant. + +Conditioned upon Your compliance with Section 3.1 below and +subject to third party intellectual property claims, the +Initial Developer hereby grants You a world-wide, +royalty-free, non-exclusive license: + +(a) under intellectual property rights (other than +patent or trademark) Licensable by Initial Developer, +to use, reproduce, modify, display, perform, +sublicense and distribute the Original Software (or +portions thereof), with or without Modifications, +and/or as part of a Larger Work; and + +(b) under Patent Claims infringed by the making, +using or selling of Original Software, to make, have +made, use, practice, sell, and offer for sale, and/or +otherwise dispose of the Original Software (or +portions thereof). + +(c) The licenses granted in Sections 2.1(a) and (b) +are effective on the date Initial Developer first +distributes or otherwise makes the Original Software +available to a third party under the terms of this +License. + +(d) Notwithstanding Section 2.1(b) above, no patent +license is granted: (1) for code that You delete from +the Original Software, or (2) for infringements +caused by: (i) the modification of the Original +Software, or (ii) the combination of the Original +Software with other software or devices. + +2.2. Contributor Grant. + +Conditioned upon Your compliance with Section 3.1 below and +subject to third party intellectual property claims, each +Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +(a) under intellectual property rights (other than +patent or trademark) Licensable by Contributor to +use, reproduce, modify, display, perform, sublicense +and distribute the Modifications created by such +Contributor (or portions thereof), either on an +unmodified basis, with other Modifications, as +Covered Software and/or as part of a Larger Work; and + +(b) under Patent Claims infringed by the making, +using, or selling of Modifications made by that +Contributor either alone and/or in combination with +its Contributor Version (or portions of such +combination), to make, use, sell, offer for sale, +have made, and/or otherwise dispose of: (1) +Modifications made by that Contributor (or portions +thereof); and (2) the combination of Modifications +made by that Contributor with its Contributor Version +(or portions of such combination). + +(c) The licenses granted in Sections 2.2(a) and +2.2(b) are effective on the date Contributor first +distributes or otherwise makes the Modifications +available to a third party. + +(d) Notwithstanding Section 2.2(b) above, no patent +license is granted: (1) for any code that Contributor +has deleted from the Contributor Version; (2) for +infringements caused by: (i) third party +modifications of Contributor Version, or (ii) the +combination of Modifications made by that Contributor +with other software (except as part of the +Contributor Version) or other devices; or (3) under +Patent Claims infringed by Covered Software in the +absence of Modifications made by that Contributor. + +3. Distribution Obligations. + +3.1. Availability of Source Code. + +Any Covered Software that You distribute or otherwise make +available in Executable form must also be made available in +Source Code form and that Source Code form must be +distributed only under the terms of this License. You must +include a copy of this License with every copy of the +Source Code form of the Covered Software You distribute or +otherwise make available. You must inform recipients of any +such Covered Software in Executable form as to how they can +obtain such Covered Software in Source Code form in a +reasonable manner on or through a medium customarily used +for software exchange. + +3.2. Modifications. + +The Modifications that You create or to which You +contribute are governed by the terms of this License. You +represent that You believe Your Modifications are Your +original creation(s) and/or You have sufficient rights to +grant the rights conveyed by this License. + +3.3. Required Notices. + +You must include a notice in each of Your Modifications +that identifies You as the Contributor of the Modification. +You may not remove or alter any copyright, patent or +trademark notices contained within the Covered Software, or +any notices of licensing or any descriptive text giving +attribution to any Contributor or the Initial Developer. + +3.4. Application of Additional Terms. + +You may not offer or impose any terms on any Covered +Software in Source Code form that alters or restricts the +applicable version of this License or the recipients' +rights hereunder. You may choose to offer, and to charge a +fee for, warranty, support, indemnity or liability +obligations to one or more recipients of Covered Software. +However, you may do so only on Your own behalf, and not on +behalf of the Initial Developer or any Contributor. You +must make it absolutely clear that any such warranty, +support, indemnity or liability obligation is offered by +You alone, and You hereby agree to indemnify the Initial +Developer and every Contributor for any liability incurred +by the Initial Developer or such Contributor as a result of +warranty, support, indemnity or liability terms You offer. + +3.5. Distribution of Executable Versions. + +You may distribute the Executable form of the Covered +Software under the terms of this License or under the terms +of a license of Your choice, which may contain terms +different from this License, provided that You are in +compliance with the terms of this License and that the +license for the Executable form does not attempt to limit +or alter the recipient's rights in the Source Code form +from the rights set forth in this License. If You +distribute the Covered Software in Executable form under a +different license, You must make it absolutely clear that +any terms which differ from this License are offered by You +alone, not by the Initial Developer or Contributor. You +hereby agree to indemnify the Initial Developer and every +Contributor for any liability incurred by the Initial +Developer or such Contributor as a result of any such terms +You offer. + +3.6. Larger Works. + +You may create a Larger Work by combining Covered Software +with other code not governed by the terms of this License +and distribute the Larger Work as a single product. In such +a case, You must make sure the requirements of this License +are fulfilled for the Covered Software. + +4. Versions of the License. + +4.1. New Versions. + +Sun Microsystems, Inc. is the initial license steward and +may publish revised and/or new versions of this License +from time to time. Each version will be given a +distinguishing version number. Except as provided in +Section 4.3, no one other than the license steward has the +right to modify this License. + +4.2. Effect of New Versions. + +You may always continue to use, distribute or otherwise +make the Covered Software available under the terms of the +version of the License under which You originally received +the Covered Software. If the Initial Developer includes a +notice in the Original Software prohibiting it from being +distributed or otherwise made available under any +subsequent version of the License, You must distribute and +make the Covered Software available under the terms of the +version of the License under which You originally received +the Covered Software. Otherwise, You may also choose to +use, distribute or otherwise make the Covered Software +available under the terms of any subsequent version of the +License published by the license steward. + +4.3. Modified Versions. + +When You are an Initial Developer and You want to create a +new license for Your Original Software, You may create and +use a modified version of this License if You: (a) rename +the license and remove any references to the name of the +license steward (except to note that the license differs +from this License); and (b) otherwise make it clear that +the license contains terms which differ from this License. + +5. DISCLAIMER OF WARRANTY. + +COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" +BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, +INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED +SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR +PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND +PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY +COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE +INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF +ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF +WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF +ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS +DISCLAIMER. + +6. TERMINATION. + +6.1. This License and the rights granted hereunder will +terminate automatically if You fail to comply with terms +herein and fail to cure such breach within 30 days of +becoming aware of the breach. Provisions which, by their +nature, must remain in effect beyond the termination of +this License shall survive. + +6.2. If You assert a patent infringement claim (excluding +declaratory judgment actions) against Initial Developer or +a Contributor (the Initial Developer or Contributor against +whom You assert such claim is referred to as "Participant") +alleging that the Participant Software (meaning the +Contributor Version where the Participant is a Contributor +or the Original Software where the Participant is the +Initial Developer) directly or indirectly infringes any +patent, then any and all rights granted directly or +indirectly to You by such Participant, the Initial +Developer (if the Initial Developer is not the Participant) +and all Contributors under Sections 2.1 and/or 2.2 of this +License shall, upon 60 days notice from Participant +terminate prospectively and automatically at the expiration +of such 60 day notice period, unless if within such 60 day +period You withdraw Your claim with respect to the +Participant Software against such Participant either +unilaterally or pursuant to a written agreement with +Participant. + +6.3. If You assert a patent infringement claim against +Participant alleging that the Participant Software directly +or indirectly infringes any patent where such claim is +resolved (such as by license or settlement) prior to the +initiation of patent infringement litigation, then the +reasonable value of the licenses granted by such Participant +under Sections 2.1 or 2.2 shall be taken into account in +determining the amount or value of any payment or license. + +6.4. In the event of termination under Sections 6.1 or 6.2 +above, all end user licenses that have been validly granted +by You or any distributor hereunder prior to termination +(excluding licenses granted to You by any distributor) +shall survive termination. + +7. LIMITATION OF LIABILITY. + +UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT +(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE +INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF +COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE +LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR +CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT +LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK +STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER +COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN +INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF +LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL +INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT +APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO +NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR +CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT +APPLY TO YOU. + +8. U.S. GOVERNMENT END USERS. + +The Covered Software is a "commercial item," as that term is +defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial +computer software" (as that term is defined at 48 C.F.R. +ยง 252.227-7014(a)(1)) and "commercial computer software +documentation" as such terms are used in 48 C.F.R. 12.212 (Sept. +1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 +through 227.7202-4 (June 1995), all U.S. Government End Users +acquire Covered Software with only those rights set forth herein. +This U.S. Government Rights clause is in lieu of, and supersedes, +any other FAR, DFAR, or other clause or provision that addresses +Government rights in computer software under this License. + +9. MISCELLANEOUS. + +This License represents the complete agreement concerning subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the +extent necessary to make it enforceable. This License shall be +governed by the law of the jurisdiction specified in a notice +contained within the Original Software (except to the extent +applicable law, if any, provides otherwise), excluding such +jurisdiction's conflict-of-law provisions. Any litigation +relating to this License shall be subject to the jurisdiction of +the courts located in the jurisdiction and venue specified in a +notice contained within the Original Software, with the losing +party responsible for costs, including, without limitation, court +costs and reasonable attorneys' fees and expenses. The +application of the United Nations Convention on Contracts for the +International Sale of Goods is expressly excluded. Any law or +regulation which provides that the language of a contract shall +be construed against the drafter shall not apply to this License. +You agree that You alone are responsible for compliance with the +United States export administration regulations (and the export +control laws and regulation of any other countries) when You use, +distribute or otherwise make available any Covered Software. + +10. RESPONSIBILITY FOR CLAIMS. + +As between Initial Developer and the Contributors, each party is +responsible for claims and damages arising, directly or +indirectly, out of its utilization of rights under this License +and You agree to work with Initial Developer and Contributors to +distribute such responsibility on an equitable basis. Nothing +herein is intended or shall be deemed to constitute any admission +of liability. + +NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND +DISTRIBUTION LICENSE (CDDL) + +The code released under the CDDL shall be governed by the laws +of the State of California (excluding conflict-of-law provisions). +Any litigation relating to this License shall be subject to the +jurisdiction of the Federal Courts of the Northern District of +California and the state courts of the State of California, with +venue lying in Santa Clara County, California. + + +The GNU General Public License (GPL) +Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim + copies of this license document, but changing it is not + allowed. + + Preamble + +The licenses for most software are designed to take away +your freedom to share and change it. By contrast, the GNU +General Public License is intended to guarantee your freedom +to share and change free software--to make sure the software +is free for all its users. This General Public License +applies to most of the Free Software Foundation's software +and to any other program whose authors commit to using it. +(Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can +apply it to your programs, too. + +When we speak of free software, we are referring to freedom, +not price. Our General Public Licenses are designed to make +sure that you have the freedom to distribute copies of free +software (and charge for this service if you wish), that you +receive source code or can get it if you want it, that you +can change the software or use pieces of it in new free +programs; and that you know you can do these things. + +To protect your rights, we need to make restrictions that +forbid anyone to deny you these rights or to ask you to +surrender the rights. These restrictions translate to +certain responsibilities for you if you distribute copies of +the software, or if you modify it. + +For example, if you distribute copies of such a program, +whether gratis or for a fee, you must give the recipients +all the rights that you have. You must make sure that they, +too, receive or can get the source code. And you must show +them these terms so they know their rights. + +We protect your rights with two steps: (1) copyright the +software, and (2) offer you this license which gives you +legal permission to copy, distribute and/or modify the +software. + +Also, for each author's protection and ours, we want to make +certain that everyone understands that there is no warranty +for this free software. If the software is modified by +someone else and passed on, we want its recipients to know +that what they have is not the original, so that any +problems introduced by others will not reflect on the +original authors' reputations. + +Finally, any free program is threatened constantly by +software patents. We wish to avoid the danger that +redistributors of a free program will individually obtain +patent licenses, in effect making the program proprietary. +To prevent this, we have made it clear that any patent must +be licensed for everyone's free use or not licensed at all. + +The precise terms and conditions for copying, distribution +and modification follow. + +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND +MODIFICATION + +0. This License applies to any program or other work which +contains a notice placed by the copyright holder saying it +may be distributed under the terms of this General Public +License. The "Program", below, refers to any such program or +work, and a "work based on the Program" means either the +Program or any derivative work under copyright law: that is +to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into +another language. (Hereinafter, translation is included +without limitation in the term "modification".) Each +licensee is addressed as "you". + +Activities other than copying, distribution and modification +are not covered by this License; they are outside its scope. +The act of running the Program is not restricted, and the +output from the Program is covered only if its contents +constitute a work based on the Program (independent of +having been made by running the Program). Whether that is +true depends on what the Program does. + +1. You may copy and distribute verbatim copies of the +Program's source code as you receive it, in any medium, +provided that you conspicuously and appropriately publish on +each copy an appropriate copyright notice and disclaimer of +warranty; keep intact all the notices that refer to this +License and to the absence of any warranty; and give any +other recipients of the Program a copy of this License along +with the Program. + +You may charge a fee for the physical act of transferring a +copy, and you may at your option offer warranty protection +in exchange for a fee. + +2. You may modify your copy or copies of the Program or any +portion of it, thus forming a work based on the Program, and +copy and distribute such modifications or work under the +terms of Section 1 above, provided that you also meet all of +these conditions: + + a) You must cause the modified files to carry prominent + notices stating that you changed the files and the date + of any change. + + b) You must cause any work that you distribute or + publish, that in whole or in part contains or is derived + from the Program or any part thereof, to be licensed as + a whole at no charge to all third parties under the + terms of this License. + + c) If the modified program normally reads commands + interactively when run, you must cause it, when started + running for such interactive use in the most ordinary + way, to print or display an announcement including an + appropriate copyright notice and a notice that there is + no warranty (or else, saying that you provide a + warranty) and that users may redistribute the program + under these conditions, and telling the user how to view + a copy of this License. (Exception: if the Program + itself is interactive but does not normally print such + an announcement, your work based on the Program is not + required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the +Program, and can be reasonably considered independent and +separate works in themselves, then this License, and its +terms, do not apply to those sections when you distribute +them as separate works. But when you distribute the same +sections as part of a whole which is a work based on the +Program, the distribution of the whole must be on the terms +of this License, whose permissions for other licensees +extend to the entire whole, and thus to each and every part +regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights +or contest your rights to work written entirely by you; +rather, the intent is to exercise the right to control the +distribution of derivative or collective works based on the +Program. + +In addition, mere aggregation of another work not based on +the Program with the Program (or with a work based on the +Program) on a volume of a storage or distribution medium +does not bring the other work under the scope of this +License. + +3. You may copy and distribute the Program (or a work based +on it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you +also do one of the following: + + a) Accompany it with the complete corresponding + machine-readable source code, which must be distributed + under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least + three years, to give any third party, for a charge no + more than your cost of physically performing source + distribution, a complete machine-readable copy of the + corresponding source code, to be distributed under the + terms of Sections 1 and 2 above on a medium customarily + used for software interchange; or, + + c) Accompany it with the information you received as to + the offer to distribute corresponding source code. (This + alternative is allowed only for noncommercial + distribution and only if you received the program in + object code or executable form with such an offer, in + accord with Subsection b above.) + +The source code for a work means the preferred form of the +work for making modifications to it. For an executable work, +complete source code means all the source code for all +modules it contains, plus any associated interface +definition files, plus the scripts used to control +compilation and installation of the executable. However, as +a special exception, the source code distributed need not +include anything that is normally distributed (in either +source or binary form) with the major components (compiler, +kernel, and so on) of the operating system on which the +executable runs, unless that component itself accompanies +the executable. + +If distribution of executable or object code is made by +offering access to copy from a designated place, then +offering equivalent access to copy the source code from the +same place counts as distribution of the source code, even +though third parties are not compelled to copy the source +along with the object code. + +4. You may not copy, modify, sublicense, or distribute the +Program except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense or distribute +the Program is void, and will automatically terminate your +rights under this License. However, parties who have +received copies, or rights, from you under this License will +not have their licenses terminated so long as such parties +remain in full compliance. + +5. You are not required to accept this License, since you +have not signed it. However, nothing else grants you +permission to modify or distribute the Program or its +derivative works. These actions are prohibited by law if you +do not accept this License. Therefore, by modifying or +distributing the Program (or any work based on the Program), +you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or +modifying the Program or works based on it. + +6. Each time you redistribute the Program (or any work based +on the Program), the recipient automatically receives a +license from the original licensor to copy, distribute or +modify the Program subject to these terms and conditions. +You may not impose any further restrictions on the +recipients' exercise of the rights granted herein. You are +not responsible for enforcing compliance by third parties to +this License. + +7. If, as a consequence of a court judgment or allegation of +patent infringement or for any other reason (not limited to +patent issues), conditions are imposed on you (whether by +court order, agreement or otherwise) that contradict the +conditions of this License, they do not excuse you from the +conditions of this License. If you cannot distribute so as +to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a +consequence you may not distribute the Program at all. For +example, if a patent license would not permit royalty-free +redistribution of the Program by all those who receive +copies directly or indirectly through you, then the only way +you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or +unenforceable under any particular circumstance, the balance +of the section is intended to apply and the section as a +whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to +infringe any patents or other property right claims or to +contest validity of any such claims; this section has the +sole purpose of protecting the integrity of the free +software distribution system, which is implemented by public +license practices. Many people have made generous +contributions to the wide range of software distributed +through that system in reliance on consistent application of +that system; it is up to the author/donor to decide if he or +she is willing to distribute software through any other +system and a licensee cannot impose that choice. + +This section is intended to make thoroughly clear what is +believed to be a consequence of the rest of this License. + +8. If the distribution and/or use of the Program is +restricted in certain countries either by patents or by +copyrighted interfaces, the original copyright holder who +places the Program under this License may add an explicit +geographical distribution limitation excluding those +countries, so that distribution is permitted only in or +among countries not thus excluded. In such case, this +License incorporates the limitation as if written in the +body of this License. + +9. The Free Software Foundation may publish revised and/or +new versions of the General Public License from time to +time. Such new versions will be similar in spirit to the +present version, but may differ in detail to address new +problems or concerns. + +Each version is given a distinguishing version number. If +the Program specifies a version number of this License which +applies to it and "any later version", you have the option +of following the terms and conditions either of that version +or of any later version published by the Free Software +Foundation. If the Program does not specify a version number +of this License, you may choose any version ever published +by the Free Software Foundation. + +10. If you wish to incorporate parts of the Program into +other free programs whose distribution conditions are +different, write to the author to ask for permission. For +software which is copyrighted by the Free Software +Foundation, write to the Free Software Foundation; we +sometimes make exceptions for this. Our decision will be +guided by the two goals of preserving the free status of all +derivatives of our free software and of promoting the +sharing and reuse of software generally. + +NO WARRANTY + +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS +NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE +COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM +"AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR +IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE +OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE +DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + +12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED +TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY +WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED +ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, +SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF +THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT +LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR +LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE +PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH +HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + +If you develop a new program, and you want it to be of the +greatest possible use to the public, the best way to achieve +this is to make it free software which everyone can +redistribute and change under these terms. + +To do so, attach the following notices to the program. It is +safest to attach them to the start of each source file to +most effectively convey the exclusion of warranty; and each +file should have at least the "copyright" line and a pointer +to where the full notice is found. + + One line to give the program's name and a brief idea of + what it does. Copyright (C) <year> <name of author> + + This program is free software; you can redistribute it + and/or modify it under the terms of the GNU General + Public License as published by the Free Software + Foundation; either version 2 of the License, or (at your + option) any later version. + + This program is distributed in the hope that it will be + useful, but WITHOUT ANY WARRANTY; without even the + implied warranty of MERCHANTABILITY or FITNESS FOR A + PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General + Public License along with this program; if not, write to + the Free Software Foundation, Inc., 59 Temple Place, + Suite 330, Boston, MA 02111-1307 USA + +Also add information on how to contact you by electronic and +paper mail. + +If the program is interactive, make it output a short notice +like this when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of + author Gnomovision comes with ABSOLUTELY NO WARRANTY; + for details type `show w'. This is free software, and + you are welcome to redistribute it under certain + conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show +the appropriate parts of the General Public License. Of +course, the commands you use may be called something other +than `show w' and `show c'; they could even be mouse-clicks +or menu items--whatever suits your program. + +You should also get your employer (if you work as a +programmer) or your school, if any, to sign a "copyright +disclaimer" for the program, if necessary. Here is a sample; +alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in + the program `Gnomovision' (which makes passes at + compilers) written by James Hacker. + + signature of Ty Coon, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating +your program into proprietary programs. If your program is a +subroutine library, you may consider it more useful to +permit linking proprietary applications with the library. If +this is what you want to do, use the GNU Library General +Public License instead of this License. + + +"CLASSPATH" EXCEPTION TO THE GPL VERSION 2 + + +Certain source files distributed by Sun Microsystems, Inc. +are subject to the following clarification and special +exception to the GPL Version 2, but only where Sun has expressly +included in the particular source file's header the words +"Sun designates this particular file as subject to the +"Classpath" exception as provided by Sun in the License file +that accompanied this code." + +Linking this library statically or dynamically with other +modules is making a combined work based on this library. +Thus, the terms and conditions of the GNU General Public +License Version 2 cover the whole combination. + +As a special exception, the copyright holders of this +library give you permission to link this library with +independent modules to produce an executable, regardless of +the license terms of these independent modules, and to copy +and distribute the resulting executable under terms of your +choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license +of that module. An independent module is a module which is +not derived from or based on this library. If you modify +this library, you may extend this exception to your version +of the library, but you are not obligated to do so. If you +do not wish to do so, delete this exception statement from +your version. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          562. arusinha commented on issue #185: [NETBEANS-54] Module Review net.java.html.boot.script URL: https://github.com/apache/incubator-netbeans/pull/185#issuecomment-338957892 Closing the pull request as Jan Lahoda will work on the same ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          563. arusinha closed pull request #185: [NETBEANS-54] Module Review net.java.html.boot.script URL: https://github.com/apache/incubator-netbeans/pull/185 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/net.java.html.boot.script/external/net.java.html.boot.script-1.4-license.txt b/net.java.html.boot.script/external/net.java.html.boot.script-1.4-license.txt new file mode 100644 index 000000000..3ea3c261f --- /dev/null +++ b/net.java.html.boot.script/external/net.java.html.boot.script-1.4-license.txt @@ -0,0 +1,827 @@ + +COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 + +1. Definitions. + +1.1. "Contributor" means each individual or entity that +creates or contributes to the creation of Modifications. + +1.2. "Contributor Version" means the combination of the +Original Software, prior Modifications used by a +Contributor (if any), and the Modifications made by that +particular Contributor. + +1.3. "Covered Software" means (a) the Original Software, or +(b) Modifications, or (c) the combination of files +containing Original Software with files containing +Modifications, in each case including portions thereof. + +1.4. "Executable" means the Covered Software in any form +other than Source Code. + +1.5. "Initial Developer" means the individual or entity +that first makes Original Software available under this +License. + +1.6. "Larger Work" means a work which combines Covered +Software or portions thereof with code not governed by the +terms of this License. + +1.7. "License" means this document. + +1.8. "Licensable" means having the right to grant, to the +maximum extent possible, whether at the time of the initial +grant or subsequently acquired, any and all of the rights +conveyed herein. + +1.9. "Modifications" means the Source Code and Executable +form of any of the following: + +A. Any file that results from an addition to, +deletion from or modification of the contents of a +file containing Original Software or previous +Modifications; + +B. Any new file that contains any part of the +Original Software or previous Modification; or + +C. Any new file that is contributed or otherwise made +available under the terms of this License. + +1.10. "Original Software" means the Source Code and +Executable form of computer software code that is +originally released under this License. + +1.11. "Patent Claims" means any patent claim(s), now owned +or hereafter acquired, including without limitation, +method, process, and apparatus claims, in any patent +Licensable by grantor. + +1.12. "Source Code" means (a) the common form of computer +software code in which modifications are made and (b) +associated documentation included in or with such code. + +1.13. "You" (or "Your") means an individual or a legal +entity exercising rights under, and complying with all of +the terms of, this License. For legal entities, "You" +includes any entity which controls, is controlled by, or is +under common control with You. For purposes of this +definition, "control" means (a) the power, direct or +indirect, to cause the direction or management of such +entity, whether by contract or otherwise, or (b) ownership +of more than fifty percent (50%) of the outstanding shares +or beneficial ownership of such entity. + +2. License Grants. + +2.1. The Initial Developer Grant. + +Conditioned upon Your compliance with Section 3.1 below and +subject to third party intellectual property claims, the +Initial Developer hereby grants You a world-wide, +royalty-free, non-exclusive license: + +(a) under intellectual property rights (other than +patent or trademark) Licensable by Initial Developer, +to use, reproduce, modify, display, perform, +sublicense and distribute the Original Software (or +portions thereof), with or without Modifications, +and/or as part of a Larger Work; and + +(b) under Patent Claims infringed by the making, +using or selling of Original Software, to make, have +made, use, practice, sell, and offer for sale, and/or +otherwise dispose of the Original Software (or +portions thereof). + +(c) The licenses granted in Sections 2.1(a) and (b) +are effective on the date Initial Developer first +distributes or otherwise makes the Original Software +available to a third party under the terms of this +License. + +(d) Notwithstanding Section 2.1(b) above, no patent +license is granted: (1) for code that You delete from +the Original Software, or (2) for infringements +caused by: (i) the modification of the Original +Software, or (ii) the combination of the Original +Software with other software or devices. + +2.2. Contributor Grant. + +Conditioned upon Your compliance with Section 3.1 below and +subject to third party intellectual property claims, each +Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +(a) under intellectual property rights (other than +patent or trademark) Licensable by Contributor to +use, reproduce, modify, display, perform, sublicense +and distribute the Modifications created by such +Contributor (or portions thereof), either on an +unmodified basis, with other Modifications, as +Covered Software and/or as part of a Larger Work; and + +(b) under Patent Claims infringed by the making, +using, or selling of Modifications made by that +Contributor either alone and/or in combination with +its Contributor Version (or portions of such +combination), to make, use, sell, offer for sale, +have made, and/or otherwise dispose of: (1) +Modifications made by that Contributor (or portions +thereof); and (2) the combination of Modifications +made by that Contributor with its Contributor Version +(or portions of such combination). + +(c) The licenses granted in Sections 2.2(a) and +2.2(b) are effective on the date Contributor first +distributes or otherwise makes the Modifications +available to a third party. + +(d) Notwithstanding Section 2.2(b) above, no patent +license is granted: (1) for any code that Contributor +has deleted from the Contributor Version; (2) for +infringements caused by: (i) third party +modifications of Contributor Version, or (ii) the +combination of Modifications made by that Contributor +with other software (except as part of the +Contributor Version) or other devices; or (3) under +Patent Claims infringed by Covered Software in the +absence of Modifications made by that Contributor. + +3. Distribution Obligations. + +3.1. Availability of Source Code. + +Any Covered Software that You distribute or otherwise make +available in Executable form must also be made available in +Source Code form and that Source Code form must be +distributed only under the terms of this License. You must +include a copy of this License with every copy of the +Source Code form of the Covered Software You distribute or +otherwise make available. You must inform recipients of any +such Covered Software in Executable form as to how they can +obtain such Covered Software in Source Code form in a +reasonable manner on or through a medium customarily used +for software exchange. + +3.2. Modifications. + +The Modifications that You create or to which You +contribute are governed by the terms of this License. You +represent that You believe Your Modifications are Your +original creation(s) and/or You have sufficient rights to +grant the rights conveyed by this License. + +3.3. Required Notices. + +You must include a notice in each of Your Modifications +that identifies You as the Contributor of the Modification. +You may not remove or alter any copyright, patent or +trademark notices contained within the Covered Software, or +any notices of licensing or any descriptive text giving +attribution to any Contributor or the Initial Developer. + +3.4. Application of Additional Terms. + +You may not offer or impose any terms on any Covered +Software in Source Code form that alters or restricts the +applicable version of this License or the recipients' +rights hereunder. You may choose to offer, and to charge a +fee for, warranty, support, indemnity or liability +obligations to one or more recipients of Covered Software. +However, you may do so only on Your own behalf, and not on +behalf of the Initial Developer or any Contributor. You +must make it absolutely clear that any such warranty, +support, indemnity or liability obligation is offered by +You alone, and You hereby agree to indemnify the Initial +Developer and every Contributor for any liability incurred +by the Initial Developer or such Contributor as a result of +warranty, support, indemnity or liability terms You offer. + +3.5. Distribution of Executable Versions. + +You may distribute the Executable form of the Covered +Software under the terms of this License or under the terms +of a license of Your choice, which may contain terms +different from this License, provided that You are in +compliance with the terms of this License and that the +license for the Executable form does not attempt to limit +or alter the recipient's rights in the Source Code form +from the rights set forth in this License. If You +distribute the Covered Software in Executable form under a +different license, You must make it absolutely clear that +any terms which differ from this License are offered by You +alone, not by the Initial Developer or Contributor. You +hereby agree to indemnify the Initial Developer and every +Contributor for any liability incurred by the Initial +Developer or such Contributor as a result of any such terms +You offer. + +3.6. Larger Works. + +You may create a Larger Work by combining Covered Software +with other code not governed by the terms of this License +and distribute the Larger Work as a single product. In such +a case, You must make sure the requirements of this License +are fulfilled for the Covered Software. + +4. Versions of the License. + +4.1. New Versions. + +Sun Microsystems, Inc. is the initial license steward and +may publish revised and/or new versions of this License +from time to time. Each version will be given a +distinguishing version number. Except as provided in +Section 4.3, no one other than the license steward has the +right to modify this License. + +4.2. Effect of New Versions. + +You may always continue to use, distribute or otherwise +make the Covered Software available under the terms of the +version of the License under which You originally received +the Covered Software. If the Initial Developer includes a +notice in the Original Software prohibiting it from being +distributed or otherwise made available under any +subsequent version of the License, You must distribute and +make the Covered Software available under the terms of the +version of the License under which You originally received +the Covered Software. Otherwise, You may also choose to +use, distribute or otherwise make the Covered Software +available under the terms of any subsequent version of the +License published by the license steward. + +4.3. Modified Versions. + +When You are an Initial Developer and You want to create a +new license for Your Original Software, You may create and +use a modified version of this License if You: (a) rename +the license and remove any references to the name of the +license steward (except to note that the license differs +from this License); and (b) otherwise make it clear that +the license contains terms which differ from this License. + +5. DISCLAIMER OF WARRANTY. + +COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" +BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, +INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED +SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR +PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND +PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY +COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE +INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF +ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF +WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF +ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS +DISCLAIMER. + +6. TERMINATION. + +6.1. This License and the rights granted hereunder will +terminate automatically if You fail to comply with terms +herein and fail to cure such breach within 30 days of +becoming aware of the breach. Provisions which, by their +nature, must remain in effect beyond the termination of +this License shall survive. + +6.2. If You assert a patent infringement claim (excluding +declaratory judgment actions) against Initial Developer or +a Contributor (the Initial Developer or Contributor against +whom You assert such claim is referred to as "Participant") +alleging that the Participant Software (meaning the +Contributor Version where the Participant is a Contributor +or the Original Software where the Participant is the +Initial Developer) directly or indirectly infringes any +patent, then any and all rights granted directly or +indirectly to You by such Participant, the Initial +Developer (if the Initial Developer is not the Participant) +and all Contributors under Sections 2.1 and/or 2.2 of this +License shall, upon 60 days notice from Participant +terminate prospectively and automatically at the expiration +of such 60 day notice period, unless if within such 60 day +period You withdraw Your claim with respect to the +Participant Software against such Participant either +unilaterally or pursuant to a written agreement with +Participant. + +6.3. If You assert a patent infringement claim against +Participant alleging that the Participant Software directly +or indirectly infringes any patent where such claim is +resolved (such as by license or settlement) prior to the +initiation of patent infringement litigation, then the +reasonable value of the licenses granted by such Participant +under Sections 2.1 or 2.2 shall be taken into account in +determining the amount or value of any payment or license. + +6.4. In the event of termination under Sections 6.1 or 6.2 +above, all end user licenses that have been validly granted +by You or any distributor hereunder prior to termination +(excluding licenses granted to You by any distributor) +shall survive termination. + +7. LIMITATION OF LIABILITY. + +UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT +(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE +INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF +COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE +LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR +CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT +LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK +STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER +COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN +INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF +LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL +INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT +APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO +NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR +CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT +APPLY TO YOU. + +8. U.S. GOVERNMENT END USERS. + +The Covered Software is a "commercial item," as that term is +defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial +computer software" (as that term is defined at 48 C.F.R. +ยง 252.227-7014(a)(1)) and "commercial computer software +documentation" as such terms are used in 48 C.F.R. 12.212 (Sept. +1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 +through 227.7202-4 (June 1995), all U.S. Government End Users +acquire Covered Software with only those rights set forth herein. +This U.S. Government Rights clause is in lieu of, and supersedes, +any other FAR, DFAR, or other clause or provision that addresses +Government rights in computer software under this License. + +9. MISCELLANEOUS. + +This License represents the complete agreement concerning subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the +extent necessary to make it enforceable. This License shall be +governed by the law of the jurisdiction specified in a notice +contained within the Original Software (except to the extent +applicable law, if any, provides otherwise), excluding such +jurisdiction's conflict-of-law provisions. Any litigation +relating to this License shall be subject to the jurisdiction of +the courts located in the jurisdiction and venue specified in a +notice contained within the Original Software, with the losing +party responsible for costs, including, without limitation, court +costs and reasonable attorneys' fees and expenses. The +application of the United Nations Convention on Contracts for the +International Sale of Goods is expressly excluded. Any law or +regulation which provides that the language of a contract shall +be construed against the drafter shall not apply to this License. +You agree that You alone are responsible for compliance with the +United States export administration regulations (and the export +control laws and regulation of any other countries) when You use, +distribute or otherwise make available any Covered Software. + +10. RESPONSIBILITY FOR CLAIMS. + +As between Initial Developer and the Contributors, each party is +responsible for claims and damages arising, directly or +indirectly, out of its utilization of rights under this License +and You agree to work with Initial Developer and Contributors to +distribute such responsibility on an equitable basis. Nothing +herein is intended or shall be deemed to constitute any admission +of liability. + +NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND +DISTRIBUTION LICENSE (CDDL) + +The code released under the CDDL shall be governed by the laws +of the State of California (excluding conflict-of-law provisions). +Any litigation relating to this License shall be subject to the +jurisdiction of the Federal Courts of the Northern District of +California and the state courts of the State of California, with +venue lying in Santa Clara County, California. + + +The GNU General Public License (GPL) +Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim + copies of this license document, but changing it is not + allowed. + + Preamble + +The licenses for most software are designed to take away +your freedom to share and change it. By contrast, the GNU +General Public License is intended to guarantee your freedom +to share and change free software--to make sure the software +is free for all its users. This General Public License +applies to most of the Free Software Foundation's software +and to any other program whose authors commit to using it. +(Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can +apply it to your programs, too. + +When we speak of free software, we are referring to freedom, +not price. Our General Public Licenses are designed to make +sure that you have the freedom to distribute copies of free +software (and charge for this service if you wish), that you +receive source code or can get it if you want it, that you +can change the software or use pieces of it in new free +programs; and that you know you can do these things. + +To protect your rights, we need to make restrictions that +forbid anyone to deny you these rights or to ask you to +surrender the rights. These restrictions translate to +certain responsibilities for you if you distribute copies of +the software, or if you modify it. + +For example, if you distribute copies of such a program, +whether gratis or for a fee, you must give the recipients +all the rights that you have. You must make sure that they, +too, receive or can get the source code. And you must show +them these terms so they know their rights. + +We protect your rights with two steps: (1) copyright the +software, and (2) offer you this license which gives you +legal permission to copy, distribute and/or modify the +software. + +Also, for each author's protection and ours, we want to make +certain that everyone understands that there is no warranty +for this free software. If the software is modified by +someone else and passed on, we want its recipients to know +that what they have is not the original, so that any +problems introduced by others will not reflect on the +original authors' reputations. + +Finally, any free program is threatened constantly by +software patents. We wish to avoid the danger that +redistributors of a free program will individually obtain +patent licenses, in effect making the program proprietary. +To prevent this, we have made it clear that any patent must +be licensed for everyone's free use or not licensed at all. + +The precise terms and conditions for copying, distribution +and modification follow. + +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND +MODIFICATION + +0. This License applies to any program or other work which +contains a notice placed by the copyright holder saying it +may be distributed under the terms of this General Public +License. The "Program", below, refers to any such program or +work, and a "work based on the Program" means either the +Program or any derivative work under copyright law: that is +to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into +another language. (Hereinafter, translation is included +without limitation in the term "modification".) Each +licensee is addressed as "you". + +Activities other than copying, distribution and modification +are not covered by this License; they are outside its scope. +The act of running the Program is not restricted, and the +output from the Program is covered only if its contents +constitute a work based on the Program (independent of +having been made by running the Program). Whether that is +true depends on what the Program does. + +1. You may copy and distribute verbatim copies of the +Program's source code as you receive it, in any medium, +provided that you conspicuously and appropriately publish on +each copy an appropriate copyright notice and disclaimer of +warranty; keep intact all the notices that refer to this +License and to the absence of any warranty; and give any +other recipients of the Program a copy of this License along +with the Program. + +You may charge a fee for the physical act of transferring a +copy, and you may at your option offer warranty protection +in exchange for a fee. + +2. You may modify your copy or copies of the Program or any +portion of it, thus forming a work based on the Program, and +copy and distribute such modifications or work under the +terms of Section 1 above, provided that you also meet all of +these conditions: + + a) You must cause the modified files to carry prominent + notices stating that you changed the files and the date + of any change. + + b) You must cause any work that you distribute or + publish, that in whole or in part contains or is derived + from the Program or any part thereof, to be licensed as + a whole at no charge to all third parties under the + terms of this License. + + c) If the modified program normally reads commands + interactively when run, you must cause it, when started + running for such interactive use in the most ordinary + way, to print or display an announcement including an + appropriate copyright notice and a notice that there is + no warranty (or else, saying that you provide a + warranty) and that users may redistribute the program + under these conditions, and telling the user how to view + a copy of this License. (Exception: if the Program + itself is interactive but does not normally print such + an announcement, your work based on the Program is not + required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the +Program, and can be reasonably considered independent and +separate works in themselves, then this License, and its +terms, do not apply to those sections when you distribute +them as separate works. But when you distribute the same +sections as part of a whole which is a work based on the +Program, the distribution of the whole must be on the terms +of this License, whose permissions for other licensees +extend to the entire whole, and thus to each and every part +regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights +or contest your rights to work written entirely by you; +rather, the intent is to exercise the right to control the +distribution of derivative or collective works based on the +Program. + +In addition, mere aggregation of another work not based on +the Program with the Program (or with a work based on the +Program) on a volume of a storage or distribution medium +does not bring the other work under the scope of this +License. + +3. You may copy and distribute the Program (or a work based +on it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you +also do one of the following: + + a) Accompany it with the complete corresponding + machine-readable source code, which must be distributed + under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least + three years, to give any third party, for a charge no + more than your cost of physically performing source + distribution, a complete machine-readable copy of the + corresponding source code, to be distributed under the + terms of Sections 1 and 2 above on a medium customarily + used for software interchange; or, + + c) Accompany it with the information you received as to + the offer to distribute corresponding source code. (This + alternative is allowed only for noncommercial + distribution and only if you received the program in + object code or executable form with such an offer, in + accord with Subsection b above.) + +The source code for a work means the preferred form of the +work for making modifications to it. For an executable work, +complete source code means all the source code for all +modules it contains, plus any associated interface +definition files, plus the scripts used to control +compilation and installation of the executable. However, as +a special exception, the source code distributed need not +include anything that is normally distributed (in either +source or binary form) with the major components (compiler, +kernel, and so on) of the operating system on which the +executable runs, unless that component itself accompanies +the executable. + +If distribution of executable or object code is made by +offering access to copy from a designated place, then +offering equivalent access to copy the source code from the +same place counts as distribution of the source code, even +though third parties are not compelled to copy the source +along with the object code. + +4. You may not copy, modify, sublicense, or distribute the +Program except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense or distribute +the Program is void, and will automatically terminate your +rights under this License. However, parties who have +received copies, or rights, from you under this License will +not have their licenses terminated so long as such parties +remain in full compliance. + +5. You are not required to accept this License, since you +have not signed it. However, nothing else grants you +permission to modify or distribute the Program or its +derivative works. These actions are prohibited by law if you +do not accept this License. Therefore, by modifying or +distributing the Program (or any work based on the Program), +you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or +modifying the Program or works based on it. + +6. Each time you redistribute the Program (or any work based +on the Program), the recipient automatically receives a +license from the original licensor to copy, distribute or +modify the Program subject to these terms and conditions. +You may not impose any further restrictions on the +recipients' exercise of the rights granted herein. You are +not responsible for enforcing compliance by third parties to +this License. + +7. If, as a consequence of a court judgment or allegation of +patent infringement or for any other reason (not limited to +patent issues), conditions are imposed on you (whether by +court order, agreement or otherwise) that contradict the +conditions of this License, they do not excuse you from the +conditions of this License. If you cannot distribute so as +to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a +consequence you may not distribute the Program at all. For +example, if a patent license would not permit royalty-free +redistribution of the Program by all those who receive +copies directly or indirectly through you, then the only way +you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or +unenforceable under any particular circumstance, the balance +of the section is intended to apply and the section as a +whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to +infringe any patents or other property right claims or to +contest validity of any such claims; this section has the +sole purpose of protecting the integrity of the free +software distribution system, which is implemented by public +license practices. Many people have made generous +contributions to the wide range of software distributed +through that system in reliance on consistent application of +that system; it is up to the author/donor to decide if he or +she is willing to distribute software through any other +system and a licensee cannot impose that choice. + +This section is intended to make thoroughly clear what is +believed to be a consequence of the rest of this License. + +8. If the distribution and/or use of the Program is +restricted in certain countries either by patents or by +copyrighted interfaces, the original copyright holder who +places the Program under this License may add an explicit +geographical distribution limitation excluding those +countries, so that distribution is permitted only in or +among countries not thus excluded. In such case, this +License incorporates the limitation as if written in the +body of this License. + +9. The Free Software Foundation may publish revised and/or +new versions of the General Public License from time to +time. Such new versions will be similar in spirit to the +present version, but may differ in detail to address new +problems or concerns. + +Each version is given a distinguishing version number. If +the Program specifies a version number of this License which +applies to it and "any later version", you have the option +of following the terms and conditions either of that version +or of any later version published by the Free Software +Foundation. If the Program does not specify a version number +of this License, you may choose any version ever published +by the Free Software Foundation. + +10. If you wish to incorporate parts of the Program into +other free programs whose distribution conditions are +different, write to the author to ask for permission. For +software which is copyrighted by the Free Software +Foundation, write to the Free Software Foundation; we +sometimes make exceptions for this. Our decision will be +guided by the two goals of preserving the free status of all +derivatives of our free software and of promoting the +sharing and reuse of software generally. + +NO WARRANTY + +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS +NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE +COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM +"AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR +IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE +OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE +DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + +12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED +TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY +WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED +ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, +SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF +THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT +LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR +LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE +PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH +HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + +If you develop a new program, and you want it to be of the +greatest possible use to the public, the best way to achieve +this is to make it free software which everyone can +redistribute and change under these terms. + +To do so, attach the following notices to the program. It is +safest to attach them to the start of each source file to +most effectively convey the exclusion of warranty; and each +file should have at least the "copyright" line and a pointer +to where the full notice is found. + + One line to give the program's name and a brief idea of + what it does. Copyright (C) <year> <name of author> + + This program is free software; you can redistribute it + and/or modify it under the terms of the GNU General + Public License as published by the Free Software + Foundation; either version 2 of the License, or (at your + option) any later version. + + This program is distributed in the hope that it will be + useful, but WITHOUT ANY WARRANTY; without even the + implied warranty of MERCHANTABILITY or FITNESS FOR A + PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General + Public License along with this program; if not, write to + the Free Software Foundation, Inc., 59 Temple Place, + Suite 330, Boston, MA 02111-1307 USA + +Also add information on how to contact you by electronic and +paper mail. + +If the program is interactive, make it output a short notice +like this when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of + author Gnomovision comes with ABSOLUTELY NO WARRANTY; + for details type `show w'. This is free software, and + you are welcome to redistribute it under certain + conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show +the appropriate parts of the General Public License. Of +course, the commands you use may be called something other +than `show w' and `show c'; they could even be mouse-clicks +or menu items--whatever suits your program. + +You should also get your employer (if you work as a +programmer) or your school, if any, to sign a "copyright +disclaimer" for the program, if necessary. Here is a sample; +alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in + the program `Gnomovision' (which makes passes at + compilers) written by James Hacker. + + signature of Ty Coon, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating +your program into proprietary programs. If your program is a +subroutine library, you may consider it more useful to +permit linking proprietary applications with the library. If +this is what you want to do, use the GNU Library General +Public License instead of this License. + + +"CLASSPATH" EXCEPTION TO THE GPL VERSION 2 + + +Certain source files distributed by Sun Microsystems, Inc. +are subject to the following clarification and special +exception to the GPL Version 2, but only where Sun has expressly +included in the particular source file's header the words +"Sun designates this particular file as subject to the +"Classpath" exception as provided by Sun in the License file +that accompanied this code." + +Linking this library statically or dynamically with other +modules is making a combined work based on this library. +Thus, the terms and conditions of the GNU General Public +License Version 2 cover the whole combination. + +As a special exception, the copyright holders of this +library give you permission to link this library with +independent modules to produce an executable, regardless of +the license terms of these independent modules, and to copy +and distribute the resulting executable under terms of your +choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license +of that module. An independent module is a module which is +not derived from or based on this library. If you modify +this library, you may extend this exception to your version +of the library, but you are not obligated to do so. If you +do not wish to do so, delete this exception statement from +your version. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          564. arusinha commented on issue #186: [NETBEANS-54] Module Review net.java.html.boot.fx URL: https://github.com/apache/incubator-netbeans/pull/186#issuecomment-338957969 Closing the pull request as Jan Lahoda will work on the same ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          565. arusinha closed pull request #186: [NETBEANS-54] Module Review net.java.html.boot.fx URL: https://github.com/apache/incubator-netbeans/pull/186 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/net.java.html.boot.fx/external/net.java.html.boot.fx-1.4-license.txt b/net.java.html.boot.fx/external/net.java.html.boot.fx-1.4-license.txt new file mode 100644 index 000000000..3ea3c261f --- /dev/null +++ b/net.java.html.boot.fx/external/net.java.html.boot.fx-1.4-license.txt @@ -0,0 +1,827 @@ + +COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 + +1. Definitions. + +1.1. "Contributor" means each individual or entity that +creates or contributes to the creation of Modifications. + +1.2. "Contributor Version" means the combination of the +Original Software, prior Modifications used by a +Contributor (if any), and the Modifications made by that +particular Contributor. + +1.3. "Covered Software" means (a) the Original Software, or +(b) Modifications, or (c) the combination of files +containing Original Software with files containing +Modifications, in each case including portions thereof. + +1.4. "Executable" means the Covered Software in any form +other than Source Code. + +1.5. "Initial Developer" means the individual or entity +that first makes Original Software available under this +License. + +1.6. "Larger Work" means a work which combines Covered +Software or portions thereof with code not governed by the +terms of this License. + +1.7. "License" means this document. + +1.8. "Licensable" means having the right to grant, to the +maximum extent possible, whether at the time of the initial +grant or subsequently acquired, any and all of the rights +conveyed herein. + +1.9. "Modifications" means the Source Code and Executable +form of any of the following: + +A. Any file that results from an addition to, +deletion from or modification of the contents of a +file containing Original Software or previous +Modifications; + +B. Any new file that contains any part of the +Original Software or previous Modification; or + +C. Any new file that is contributed or otherwise made +available under the terms of this License. + +1.10. "Original Software" means the Source Code and +Executable form of computer software code that is +originally released under this License. + +1.11. "Patent Claims" means any patent claim(s), now owned +or hereafter acquired, including without limitation, +method, process, and apparatus claims, in any patent +Licensable by grantor. + +1.12. "Source Code" means (a) the common form of computer +software code in which modifications are made and (b) +associated documentation included in or with such code. + +1.13. "You" (or "Your") means an individual or a legal +entity exercising rights under, and complying with all of +the terms of, this License. For legal entities, "You" +includes any entity which controls, is controlled by, or is +under common control with You. For purposes of this +definition, "control" means (a) the power, direct or +indirect, to cause the direction or management of such +entity, whether by contract or otherwise, or (b) ownership +of more than fifty percent (50%) of the outstanding shares +or beneficial ownership of such entity. + +2. License Grants. + +2.1. The Initial Developer Grant. + +Conditioned upon Your compliance with Section 3.1 below and +subject to third party intellectual property claims, the +Initial Developer hereby grants You a world-wide, +royalty-free, non-exclusive license: + +(a) under intellectual property rights (other than +patent or trademark) Licensable by Initial Developer, +to use, reproduce, modify, display, perform, +sublicense and distribute the Original Software (or +portions thereof), with or without Modifications, +and/or as part of a Larger Work; and + +(b) under Patent Claims infringed by the making, +using or selling of Original Software, to make, have +made, use, practice, sell, and offer for sale, and/or +otherwise dispose of the Original Software (or +portions thereof). + +(c) The licenses granted in Sections 2.1(a) and (b) +are effective on the date Initial Developer first +distributes or otherwise makes the Original Software +available to a third party under the terms of this +License. + +(d) Notwithstanding Section 2.1(b) above, no patent +license is granted: (1) for code that You delete from +the Original Software, or (2) for infringements +caused by: (i) the modification of the Original +Software, or (ii) the combination of the Original +Software with other software or devices. + +2.2. Contributor Grant. + +Conditioned upon Your compliance with Section 3.1 below and +subject to third party intellectual property claims, each +Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +(a) under intellectual property rights (other than +patent or trademark) Licensable by Contributor to +use, reproduce, modify, display, perform, sublicense +and distribute the Modifications created by such +Contributor (or portions thereof), either on an +unmodified basis, with other Modifications, as +Covered Software and/or as part of a Larger Work; and + +(b) under Patent Claims infringed by the making, +using, or selling of Modifications made by that +Contributor either alone and/or in combination with +its Contributor Version (or portions of such +combination), to make, use, sell, offer for sale, +have made, and/or otherwise dispose of: (1) +Modifications made by that Contributor (or portions +thereof); and (2) the combination of Modifications +made by that Contributor with its Contributor Version +(or portions of such combination). + +(c) The licenses granted in Sections 2.2(a) and +2.2(b) are effective on the date Contributor first +distributes or otherwise makes the Modifications +available to a third party. + +(d) Notwithstanding Section 2.2(b) above, no patent +license is granted: (1) for any code that Contributor +has deleted from the Contributor Version; (2) for +infringements caused by: (i) third party +modifications of Contributor Version, or (ii) the +combination of Modifications made by that Contributor +with other software (except as part of the +Contributor Version) or other devices; or (3) under +Patent Claims infringed by Covered Software in the +absence of Modifications made by that Contributor. + +3. Distribution Obligations. + +3.1. Availability of Source Code. + +Any Covered Software that You distribute or otherwise make +available in Executable form must also be made available in +Source Code form and that Source Code form must be +distributed only under the terms of this License. You must +include a copy of this License with every copy of the +Source Code form of the Covered Software You distribute or +otherwise make available. You must inform recipients of any +such Covered Software in Executable form as to how they can +obtain such Covered Software in Source Code form in a +reasonable manner on or through a medium customarily used +for software exchange. + +3.2. Modifications. + +The Modifications that You create or to which You +contribute are governed by the terms of this License. You +represent that You believe Your Modifications are Your +original creation(s) and/or You have sufficient rights to +grant the rights conveyed by this License. + +3.3. Required Notices. + +You must include a notice in each of Your Modifications +that identifies You as the Contributor of the Modification. +You may not remove or alter any copyright, patent or +trademark notices contained within the Covered Software, or +any notices of licensing or any descriptive text giving +attribution to any Contributor or the Initial Developer. + +3.4. Application of Additional Terms. + +You may not offer or impose any terms on any Covered +Software in Source Code form that alters or restricts the +applicable version of this License or the recipients' +rights hereunder. You may choose to offer, and to charge a +fee for, warranty, support, indemnity or liability +obligations to one or more recipients of Covered Software. +However, you may do so only on Your own behalf, and not on +behalf of the Initial Developer or any Contributor. You +must make it absolutely clear that any such warranty, +support, indemnity or liability obligation is offered by +You alone, and You hereby agree to indemnify the Initial +Developer and every Contributor for any liability incurred +by the Initial Developer or such Contributor as a result of +warranty, support, indemnity or liability terms You offer. + +3.5. Distribution of Executable Versions. + +You may distribute the Executable form of the Covered +Software under the terms of this License or under the terms +of a license of Your choice, which may contain terms +different from this License, provided that You are in +compliance with the terms of this License and that the +license for the Executable form does not attempt to limit +or alter the recipient's rights in the Source Code form +from the rights set forth in this License. If You +distribute the Covered Software in Executable form under a +different license, You must make it absolutely clear that +any terms which differ from this License are offered by You +alone, not by the Initial Developer or Contributor. You +hereby agree to indemnify the Initial Developer and every +Contributor for any liability incurred by the Initial +Developer or such Contributor as a result of any such terms +You offer. + +3.6. Larger Works. + +You may create a Larger Work by combining Covered Software +with other code not governed by the terms of this License +and distribute the Larger Work as a single product. In such +a case, You must make sure the requirements of this License +are fulfilled for the Covered Software. + +4. Versions of the License. + +4.1. New Versions. + +Sun Microsystems, Inc. is the initial license steward and +may publish revised and/or new versions of this License +from time to time. Each version will be given a +distinguishing version number. Except as provided in +Section 4.3, no one other than the license steward has the +right to modify this License. + +4.2. Effect of New Versions. + +You may always continue to use, distribute or otherwise +make the Covered Software available under the terms of the +version of the License under which You originally received +the Covered Software. If the Initial Developer includes a +notice in the Original Software prohibiting it from being +distributed or otherwise made available under any +subsequent version of the License, You must distribute and +make the Covered Software available under the terms of the +version of the License under which You originally received +the Covered Software. Otherwise, You may also choose to +use, distribute or otherwise make the Covered Software +available under the terms of any subsequent version of the +License published by the license steward. + +4.3. Modified Versions. + +When You are an Initial Developer and You want to create a +new license for Your Original Software, You may create and +use a modified version of this License if You: (a) rename +the license and remove any references to the name of the +license steward (except to note that the license differs +from this License); and (b) otherwise make it clear that +the license contains terms which differ from this License. + +5. DISCLAIMER OF WARRANTY. + +COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" +BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, +INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED +SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR +PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND +PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY +COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE +INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF +ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF +WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF +ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS +DISCLAIMER. + +6. TERMINATION. + +6.1. This License and the rights granted hereunder will +terminate automatically if You fail to comply with terms +herein and fail to cure such breach within 30 days of +becoming aware of the breach. Provisions which, by their +nature, must remain in effect beyond the termination of +this License shall survive. + +6.2. If You assert a patent infringement claim (excluding +declaratory judgment actions) against Initial Developer or +a Contributor (the Initial Developer or Contributor against +whom You assert such claim is referred to as "Participant") +alleging that the Participant Software (meaning the +Contributor Version where the Participant is a Contributor +or the Original Software where the Participant is the +Initial Developer) directly or indirectly infringes any +patent, then any and all rights granted directly or +indirectly to You by such Participant, the Initial +Developer (if the Initial Developer is not the Participant) +and all Contributors under Sections 2.1 and/or 2.2 of this +License shall, upon 60 days notice from Participant +terminate prospectively and automatically at the expiration +of such 60 day notice period, unless if within such 60 day +period You withdraw Your claim with respect to the +Participant Software against such Participant either +unilaterally or pursuant to a written agreement with +Participant. + +6.3. If You assert a patent infringement claim against +Participant alleging that the Participant Software directly +or indirectly infringes any patent where such claim is +resolved (such as by license or settlement) prior to the +initiation of patent infringement litigation, then the +reasonable value of the licenses granted by such Participant +under Sections 2.1 or 2.2 shall be taken into account in +determining the amount or value of any payment or license. + +6.4. In the event of termination under Sections 6.1 or 6.2 +above, all end user licenses that have been validly granted +by You or any distributor hereunder prior to termination +(excluding licenses granted to You by any distributor) +shall survive termination. + +7. LIMITATION OF LIABILITY. + +UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT +(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE +INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF +COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE +LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR +CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT +LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK +STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER +COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN +INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF +LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL +INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT +APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO +NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR +CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT +APPLY TO YOU. + +8. U.S. GOVERNMENT END USERS. + +The Covered Software is a "commercial item," as that term is +defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial +computer software" (as that term is defined at 48 C.F.R. +ยง 252.227-7014(a)(1)) and "commercial computer software +documentation" as such terms are used in 48 C.F.R. 12.212 (Sept. +1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 +through 227.7202-4 (June 1995), all U.S. Government End Users +acquire Covered Software with only those rights set forth herein. +This U.S. Government Rights clause is in lieu of, and supersedes, +any other FAR, DFAR, or other clause or provision that addresses +Government rights in computer software under this License. + +9. MISCELLANEOUS. + +This License represents the complete agreement concerning subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the +extent necessary to make it enforceable. This License shall be +governed by the law of the jurisdiction specified in a notice +contained within the Original Software (except to the extent +applicable law, if any, provides otherwise), excluding such +jurisdiction's conflict-of-law provisions. Any litigation +relating to this License shall be subject to the jurisdiction of +the courts located in the jurisdiction and venue specified in a +notice contained within the Original Software, with the losing +party responsible for costs, including, without limitation, court +costs and reasonable attorneys' fees and expenses. The +application of the United Nations Convention on Contracts for the +International Sale of Goods is expressly excluded. Any law or +regulation which provides that the language of a contract shall +be construed against the drafter shall not apply to this License. +You agree that You alone are responsible for compliance with the +United States export administration regulations (and the export +control laws and regulation of any other countries) when You use, +distribute or otherwise make available any Covered Software. + +10. RESPONSIBILITY FOR CLAIMS. + +As between Initial Developer and the Contributors, each party is +responsible for claims and damages arising, directly or +indirectly, out of its utilization of rights under this License +and You agree to work with Initial Developer and Contributors to +distribute such responsibility on an equitable basis. Nothing +herein is intended or shall be deemed to constitute any admission +of liability. + +NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND +DISTRIBUTION LICENSE (CDDL) + +The code released under the CDDL shall be governed by the laws +of the State of California (excluding conflict-of-law provisions). +Any litigation relating to this License shall be subject to the +jurisdiction of the Federal Courts of the Northern District of +California and the state courts of the State of California, with +venue lying in Santa Clara County, California. + + +The GNU General Public License (GPL) +Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim + copies of this license document, but changing it is not + allowed. + + Preamble + +The licenses for most software are designed to take away +your freedom to share and change it. By contrast, the GNU +General Public License is intended to guarantee your freedom +to share and change free software--to make sure the software +is free for all its users. This General Public License +applies to most of the Free Software Foundation's software +and to any other program whose authors commit to using it. +(Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can +apply it to your programs, too. + +When we speak of free software, we are referring to freedom, +not price. Our General Public Licenses are designed to make +sure that you have the freedom to distribute copies of free +software (and charge for this service if you wish), that you +receive source code or can get it if you want it, that you +can change the software or use pieces of it in new free +programs; and that you know you can do these things. + +To protect your rights, we need to make restrictions that +forbid anyone to deny you these rights or to ask you to +surrender the rights. These restrictions translate to +certain responsibilities for you if you distribute copies of +the software, or if you modify it. + +For example, if you distribute copies of such a program, +whether gratis or for a fee, you must give the recipients +all the rights that you have. You must make sure that they, +too, receive or can get the source code. And you must show +them these terms so they know their rights. + +We protect your rights with two steps: (1) copyright the +software, and (2) offer you this license which gives you +legal permission to copy, distribute and/or modify the +software. + +Also, for each author's protection and ours, we want to make +certain that everyone understands that there is no warranty +for this free software. If the software is modified by +someone else and passed on, we want its recipients to know +that what they have is not the original, so that any +problems introduced by others will not reflect on the +original authors' reputations. + +Finally, any free program is threatened constantly by +software patents. We wish to avoid the danger that +redistributors of a free program will individually obtain +patent licenses, in effect making the program proprietary. +To prevent this, we have made it clear that any patent must +be licensed for everyone's free use or not licensed at all. + +The precise terms and conditions for copying, distribution +and modification follow. + +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND +MODIFICATION + +0. This License applies to any program or other work which +contains a notice placed by the copyright holder saying it +may be distributed under the terms of this General Public +License. The "Program", below, refers to any such program or +work, and a "work based on the Program" means either the +Program or any derivative work under copyright law: that is +to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into +another language. (Hereinafter, translation is included +without limitation in the term "modification".) Each +licensee is addressed as "you". + +Activities other than copying, distribution and modification +are not covered by this License; they are outside its scope. +The act of running the Program is not restricted, and the +output from the Program is covered only if its contents +constitute a work based on the Program (independent of +having been made by running the Program). Whether that is +true depends on what the Program does. + +1. You may copy and distribute verbatim copies of the +Program's source code as you receive it, in any medium, +provided that you conspicuously and appropriately publish on +each copy an appropriate copyright notice and disclaimer of +warranty; keep intact all the notices that refer to this +License and to the absence of any warranty; and give any +other recipients of the Program a copy of this License along +with the Program. + +You may charge a fee for the physical act of transferring a +copy, and you may at your option offer warranty protection +in exchange for a fee. + +2. You may modify your copy or copies of the Program or any +portion of it, thus forming a work based on the Program, and +copy and distribute such modifications or work under the +terms of Section 1 above, provided that you also meet all of +these conditions: + + a) You must cause the modified files to carry prominent + notices stating that you changed the files and the date + of any change. + + b) You must cause any work that you distribute or + publish, that in whole or in part contains or is derived + from the Program or any part thereof, to be licensed as + a whole at no charge to all third parties under the + terms of this License. + + c) If the modified program normally reads commands + interactively when run, you must cause it, when started + running for such interactive use in the most ordinary + way, to print or display an announcement including an + appropriate copyright notice and a notice that there is + no warranty (or else, saying that you provide a + warranty) and that users may redistribute the program + under these conditions, and telling the user how to view + a copy of this License. (Exception: if the Program + itself is interactive but does not normally print such + an announcement, your work based on the Program is not + required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the +Program, and can be reasonably considered independent and +separate works in themselves, then this License, and its +terms, do not apply to those sections when you distribute +them as separate works. But when you distribute the same +sections as part of a whole which is a work based on the +Program, the distribution of the whole must be on the terms +of this License, whose permissions for other licensees +extend to the entire whole, and thus to each and every part +regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights +or contest your rights to work written entirely by you; +rather, the intent is to exercise the right to control the +distribution of derivative or collective works based on the +Program. + +In addition, mere aggregation of another work not based on +the Program with the Program (or with a work based on the +Program) on a volume of a storage or distribution medium +does not bring the other work under the scope of this +License. + +3. You may copy and distribute the Program (or a work based +on it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you +also do one of the following: + + a) Accompany it with the complete corresponding + machine-readable source code, which must be distributed + under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least + three years, to give any third party, for a charge no + more than your cost of physically performing source + distribution, a complete machine-readable copy of the + corresponding source code, to be distributed under the + terms of Sections 1 and 2 above on a medium customarily + used for software interchange; or, + + c) Accompany it with the information you received as to + the offer to distribute corresponding source code. (This + alternative is allowed only for noncommercial + distribution and only if you received the program in + object code or executable form with such an offer, in + accord with Subsection b above.) + +The source code for a work means the preferred form of the +work for making modifications to it. For an executable work, +complete source code means all the source code for all +modules it contains, plus any associated interface +definition files, plus the scripts used to control +compilation and installation of the executable. However, as +a special exception, the source code distributed need not +include anything that is normally distributed (in either +source or binary form) with the major components (compiler, +kernel, and so on) of the operating system on which the +executable runs, unless that component itself accompanies +the executable. + +If distribution of executable or object code is made by +offering access to copy from a designated place, then +offering equivalent access to copy the source code from the +same place counts as distribution of the source code, even +though third parties are not compelled to copy the source +along with the object code. + +4. You may not copy, modify, sublicense, or distribute the +Program except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense or distribute +the Program is void, and will automatically terminate your +rights under this License. However, parties who have +received copies, or rights, from you under this License will +not have their licenses terminated so long as such parties +remain in full compliance. + +5. You are not required to accept this License, since you +have not signed it. However, nothing else grants you +permission to modify or distribute the Program or its +derivative works. These actions are prohibited by law if you +do not accept this License. Therefore, by modifying or +distributing the Program (or any work based on the Program), +you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or +modifying the Program or works based on it. + +6. Each time you redistribute the Program (or any work based +on the Program), the recipient automatically receives a +license from the original licensor to copy, distribute or +modify the Program subject to these terms and conditions. +You may not impose any further restrictions on the +recipients' exercise of the rights granted herein. You are +not responsible for enforcing compliance by third parties to +this License. + +7. If, as a consequence of a court judgment or allegation of +patent infringement or for any other reason (not limited to +patent issues), conditions are imposed on you (whether by +court order, agreement or otherwise) that contradict the +conditions of this License, they do not excuse you from the +conditions of this License. If you cannot distribute so as +to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a +consequence you may not distribute the Program at all. For +example, if a patent license would not permit royalty-free +redistribution of the Program by all those who receive +copies directly or indirectly through you, then the only way +you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or +unenforceable under any particular circumstance, the balance +of the section is intended to apply and the section as a +whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to +infringe any patents or other property right claims or to +contest validity of any such claims; this section has the +sole purpose of protecting the integrity of the free +software distribution system, which is implemented by public +license practices. Many people have made generous +contributions to the wide range of software distributed +through that system in reliance on consistent application of +that system; it is up to the author/donor to decide if he or +she is willing to distribute software through any other +system and a licensee cannot impose that choice. + +This section is intended to make thoroughly clear what is +believed to be a consequence of the rest of this License. + +8. If the distribution and/or use of the Program is +restricted in certain countries either by patents or by +copyrighted interfaces, the original copyright holder who +places the Program under this License may add an explicit +geographical distribution limitation excluding those +countries, so that distribution is permitted only in or +among countries not thus excluded. In such case, this +License incorporates the limitation as if written in the +body of this License. + +9. The Free Software Foundation may publish revised and/or +new versions of the General Public License from time to +time. Such new versions will be similar in spirit to the +present version, but may differ in detail to address new +problems or concerns. + +Each version is given a distinguishing version number. If +the Program specifies a version number of this License which +applies to it and "any later version", you have the option +of following the terms and conditions either of that version +or of any later version published by the Free Software +Foundation. If the Program does not specify a version number +of this License, you may choose any version ever published +by the Free Software Foundation. + +10. If you wish to incorporate parts of the Program into +other free programs whose distribution conditions are +different, write to the author to ask for permission. For +software which is copyrighted by the Free Software +Foundation, write to the Free Software Foundation; we +sometimes make exceptions for this. Our decision will be +guided by the two goals of preserving the free status of all +derivatives of our free software and of promoting the +sharing and reuse of software generally. + +NO WARRANTY + +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS +NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE +COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM +"AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR +IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE +OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE +DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + +12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED +TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY +WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED +ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, +SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF +THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT +LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR +LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE +PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH +HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + +If you develop a new program, and you want it to be of the +greatest possible use to the public, the best way to achieve +this is to make it free software which everyone can +redistribute and change under these terms. + +To do so, attach the following notices to the program. It is +safest to attach them to the start of each source file to +most effectively convey the exclusion of warranty; and each +file should have at least the "copyright" line and a pointer +to where the full notice is found. + + One line to give the program's name and a brief idea of + what it does. Copyright (C) <year> <name of author> + + This program is free software; you can redistribute it + and/or modify it under the terms of the GNU General + Public License as published by the Free Software + Foundation; either version 2 of the License, or (at your + option) any later version. + + This program is distributed in the hope that it will be + useful, but WITHOUT ANY WARRANTY; without even the + implied warranty of MERCHANTABILITY or FITNESS FOR A + PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General + Public License along with this program; if not, write to + the Free Software Foundation, Inc., 59 Temple Place, + Suite 330, Boston, MA 02111-1307 USA + +Also add information on how to contact you by electronic and +paper mail. + +If the program is interactive, make it output a short notice +like this when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of + author Gnomovision comes with ABSOLUTELY NO WARRANTY; + for details type `show w'. This is free software, and + you are welcome to redistribute it under certain + conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show +the appropriate parts of the General Public License. Of +course, the commands you use may be called something other +than `show w' and `show c'; they could even be mouse-clicks +or menu items--whatever suits your program. + +You should also get your employer (if you work as a +programmer) or your school, if any, to sign a "copyright +disclaimer" for the program, if necessary. Here is a sample; +alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in + the program `Gnomovision' (which makes passes at + compilers) written by James Hacker. + + signature of Ty Coon, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating +your program into proprietary programs. If your program is a +subroutine library, you may consider it more useful to +permit linking proprietary applications with the library. If +this is what you want to do, use the GNU Library General +Public License instead of this License. + + +"CLASSPATH" EXCEPTION TO THE GPL VERSION 2 + + +Certain source files distributed by Sun Microsystems, Inc. +are subject to the following clarification and special +exception to the GPL Version 2, but only where Sun has expressly +included in the particular source file's header the words +"Sun designates this particular file as subject to the +"Classpath" exception as provided by Sun in the License file +that accompanied this code." + +Linking this library statically or dynamically with other +modules is making a combined work based on this library. +Thus, the terms and conditions of the GNU General Public +License Version 2 cover the whole combination. + +As a special exception, the copyright holders of this +library give you permission to link this library with +independent modules to produce an executable, regardless of +the license terms of these independent modules, and to copy +and distribute the resulting executable under terms of your +choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license +of that module. An independent module is a module which is +not derived from or based on this library. If you modify +this library, you may extend this exception to your version +of the library, but you are not obligated to do so. If you +do not wish to do so, delete this exception statement from +your version. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          566. arusinha commented on issue #188: [NETBEANS-54] Module Review net.java.html.boot URL: https://github.com/apache/incubator-netbeans/pull/188#issuecomment-338958063 Closing the pull request as Jan Lahoda will work on the same ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          567. arusinha closed pull request #188: [NETBEANS-54] Module Review net.java.html.boot URL: https://github.com/apache/incubator-netbeans/pull/188 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/net.java.html.boot/external/net.java.html.boot-1.4-license.txt b/net.java.html.boot/external/net.java.html.boot-1.4-license.txt new file mode 100644 index 000000000..3ea3c261f --- /dev/null +++ b/net.java.html.boot/external/net.java.html.boot-1.4-license.txt @@ -0,0 +1,827 @@ + +COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 + +1. Definitions. + +1.1. "Contributor" means each individual or entity that +creates or contributes to the creation of Modifications. + +1.2. "Contributor Version" means the combination of the +Original Software, prior Modifications used by a +Contributor (if any), and the Modifications made by that +particular Contributor. + +1.3. "Covered Software" means (a) the Original Software, or +(b) Modifications, or (c) the combination of files +containing Original Software with files containing +Modifications, in each case including portions thereof. + +1.4. "Executable" means the Covered Software in any form +other than Source Code. + +1.5. "Initial Developer" means the individual or entity +that first makes Original Software available under this +License. + +1.6. "Larger Work" means a work which combines Covered +Software or portions thereof with code not governed by the +terms of this License. + +1.7. "License" means this document. + +1.8. "Licensable" means having the right to grant, to the +maximum extent possible, whether at the time of the initial +grant or subsequently acquired, any and all of the rights +conveyed herein. + +1.9. "Modifications" means the Source Code and Executable +form of any of the following: + +A. Any file that results from an addition to, +deletion from or modification of the contents of a +file containing Original Software or previous +Modifications; + +B. Any new file that contains any part of the +Original Software or previous Modification; or + +C. Any new file that is contributed or otherwise made +available under the terms of this License. + +1.10. "Original Software" means the Source Code and +Executable form of computer software code that is +originally released under this License. + +1.11. "Patent Claims" means any patent claim(s), now owned +or hereafter acquired, including without limitation, +method, process, and apparatus claims, in any patent +Licensable by grantor. + +1.12. "Source Code" means (a) the common form of computer +software code in which modifications are made and (b) +associated documentation included in or with such code. + +1.13. "You" (or "Your") means an individual or a legal +entity exercising rights under, and complying with all of +the terms of, this License. For legal entities, "You" +includes any entity which controls, is controlled by, or is +under common control with You. For purposes of this +definition, "control" means (a) the power, direct or +indirect, to cause the direction or management of such +entity, whether by contract or otherwise, or (b) ownership +of more than fifty percent (50%) of the outstanding shares +or beneficial ownership of such entity. + +2. License Grants. + +2.1. The Initial Developer Grant. + +Conditioned upon Your compliance with Section 3.1 below and +subject to third party intellectual property claims, the +Initial Developer hereby grants You a world-wide, +royalty-free, non-exclusive license: + +(a) under intellectual property rights (other than +patent or trademark) Licensable by Initial Developer, +to use, reproduce, modify, display, perform, +sublicense and distribute the Original Software (or +portions thereof), with or without Modifications, +and/or as part of a Larger Work; and + +(b) under Patent Claims infringed by the making, +using or selling of Original Software, to make, have +made, use, practice, sell, and offer for sale, and/or +otherwise dispose of the Original Software (or +portions thereof). + +(c) The licenses granted in Sections 2.1(a) and (b) +are effective on the date Initial Developer first +distributes or otherwise makes the Original Software +available to a third party under the terms of this +License. + +(d) Notwithstanding Section 2.1(b) above, no patent +license is granted: (1) for code that You delete from +the Original Software, or (2) for infringements +caused by: (i) the modification of the Original +Software, or (ii) the combination of the Original +Software with other software or devices. + +2.2. Contributor Grant. + +Conditioned upon Your compliance with Section 3.1 below and +subject to third party intellectual property claims, each +Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +(a) under intellectual property rights (other than +patent or trademark) Licensable by Contributor to +use, reproduce, modify, display, perform, sublicense +and distribute the Modifications created by such +Contributor (or portions thereof), either on an +unmodified basis, with other Modifications, as +Covered Software and/or as part of a Larger Work; and + +(b) under Patent Claims infringed by the making, +using, or selling of Modifications made by that +Contributor either alone and/or in combination with +its Contributor Version (or portions of such +combination), to make, use, sell, offer for sale, +have made, and/or otherwise dispose of: (1) +Modifications made by that Contributor (or portions +thereof); and (2) the combination of Modifications +made by that Contributor with its Contributor Version +(or portions of such combination). + +(c) The licenses granted in Sections 2.2(a) and +2.2(b) are effective on the date Contributor first +distributes or otherwise makes the Modifications +available to a third party. + +(d) Notwithstanding Section 2.2(b) above, no patent +license is granted: (1) for any code that Contributor +has deleted from the Contributor Version; (2) for +infringements caused by: (i) third party +modifications of Contributor Version, or (ii) the +combination of Modifications made by that Contributor +with other software (except as part of the +Contributor Version) or other devices; or (3) under +Patent Claims infringed by Covered Software in the +absence of Modifications made by that Contributor. + +3. Distribution Obligations. + +3.1. Availability of Source Code. + +Any Covered Software that You distribute or otherwise make +available in Executable form must also be made available in +Source Code form and that Source Code form must be +distributed only under the terms of this License. You must +include a copy of this License with every copy of the +Source Code form of the Covered Software You distribute or +otherwise make available. You must inform recipients of any +such Covered Software in Executable form as to how they can +obtain such Covered Software in Source Code form in a +reasonable manner on or through a medium customarily used +for software exchange. + +3.2. Modifications. + +The Modifications that You create or to which You +contribute are governed by the terms of this License. You +represent that You believe Your Modifications are Your +original creation(s) and/or You have sufficient rights to +grant the rights conveyed by this License. + +3.3. Required Notices. + +You must include a notice in each of Your Modifications +that identifies You as the Contributor of the Modification. +You may not remove or alter any copyright, patent or +trademark notices contained within the Covered Software, or +any notices of licensing or any descriptive text giving +attribution to any Contributor or the Initial Developer. + +3.4. Application of Additional Terms. + +You may not offer or impose any terms on any Covered +Software in Source Code form that alters or restricts the +applicable version of this License or the recipients' +rights hereunder. You may choose to offer, and to charge a +fee for, warranty, support, indemnity or liability +obligations to one or more recipients of Covered Software. +However, you may do so only on Your own behalf, and not on +behalf of the Initial Developer or any Contributor. You +must make it absolutely clear that any such warranty, +support, indemnity or liability obligation is offered by +You alone, and You hereby agree to indemnify the Initial +Developer and every Contributor for any liability incurred +by the Initial Developer or such Contributor as a result of +warranty, support, indemnity or liability terms You offer. + +3.5. Distribution of Executable Versions. + +You may distribute the Executable form of the Covered +Software under the terms of this License or under the terms +of a license of Your choice, which may contain terms +different from this License, provided that You are in +compliance with the terms of this License and that the +license for the Executable form does not attempt to limit +or alter the recipient's rights in the Source Code form +from the rights set forth in this License. If You +distribute the Covered Software in Executable form under a +different license, You must make it absolutely clear that +any terms which differ from this License are offered by You +alone, not by the Initial Developer or Contributor. You +hereby agree to indemnify the Initial Developer and every +Contributor for any liability incurred by the Initial +Developer or such Contributor as a result of any such terms +You offer. + +3.6. Larger Works. + +You may create a Larger Work by combining Covered Software +with other code not governed by the terms of this License +and distribute the Larger Work as a single product. In such +a case, You must make sure the requirements of this License +are fulfilled for the Covered Software. + +4. Versions of the License. + +4.1. New Versions. + +Sun Microsystems, Inc. is the initial license steward and +may publish revised and/or new versions of this License +from time to time. Each version will be given a +distinguishing version number. Except as provided in +Section 4.3, no one other than the license steward has the +right to modify this License. + +4.2. Effect of New Versions. + +You may always continue to use, distribute or otherwise +make the Covered Software available under the terms of the +version of the License under which You originally received +the Covered Software. If the Initial Developer includes a +notice in the Original Software prohibiting it from being +distributed or otherwise made available under any +subsequent version of the License, You must distribute and +make the Covered Software available under the terms of the +version of the License under which You originally received +the Covered Software. Otherwise, You may also choose to +use, distribute or otherwise make the Covered Software +available under the terms of any subsequent version of the +License published by the license steward. + +4.3. Modified Versions. + +When You are an Initial Developer and You want to create a +new license for Your Original Software, You may create and +use a modified version of this License if You: (a) rename +the license and remove any references to the name of the +license steward (except to note that the license differs +from this License); and (b) otherwise make it clear that +the license contains terms which differ from this License. + +5. DISCLAIMER OF WARRANTY. + +COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" +BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, +INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED +SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR +PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND +PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY +COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE +INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF +ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF +WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF +ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS +DISCLAIMER. + +6. TERMINATION. + +6.1. This License and the rights granted hereunder will +terminate automatically if You fail to comply with terms +herein and fail to cure such breach within 30 days of +becoming aware of the breach. Provisions which, by their +nature, must remain in effect beyond the termination of +this License shall survive. + +6.2. If You assert a patent infringement claim (excluding +declaratory judgment actions) against Initial Developer or +a Contributor (the Initial Developer or Contributor against +whom You assert such claim is referred to as "Participant") +alleging that the Participant Software (meaning the +Contributor Version where the Participant is a Contributor +or the Original Software where the Participant is the +Initial Developer) directly or indirectly infringes any +patent, then any and all rights granted directly or +indirectly to You by such Participant, the Initial +Developer (if the Initial Developer is not the Participant) +and all Contributors under Sections 2.1 and/or 2.2 of this +License shall, upon 60 days notice from Participant +terminate prospectively and automatically at the expiration +of such 60 day notice period, unless if within such 60 day +period You withdraw Your claim with respect to the +Participant Software against such Participant either +unilaterally or pursuant to a written agreement with +Participant. + +6.3. If You assert a patent infringement claim against +Participant alleging that the Participant Software directly +or indirectly infringes any patent where such claim is +resolved (such as by license or settlement) prior to the +initiation of patent infringement litigation, then the +reasonable value of the licenses granted by such Participant +under Sections 2.1 or 2.2 shall be taken into account in +determining the amount or value of any payment or license. + +6.4. In the event of termination under Sections 6.1 or 6.2 +above, all end user licenses that have been validly granted +by You or any distributor hereunder prior to termination +(excluding licenses granted to You by any distributor) +shall survive termination. + +7. LIMITATION OF LIABILITY. + +UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT +(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE +INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF +COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE +LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR +CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT +LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK +STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER +COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN +INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF +LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL +INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT +APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO +NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR +CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT +APPLY TO YOU. + +8. U.S. GOVERNMENT END USERS. + +The Covered Software is a "commercial item," as that term is +defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial +computer software" (as that term is defined at 48 C.F.R. +ยง 252.227-7014(a)(1)) and "commercial computer software +documentation" as such terms are used in 48 C.F.R. 12.212 (Sept. +1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 +through 227.7202-4 (June 1995), all U.S. Government End Users +acquire Covered Software with only those rights set forth herein. +This U.S. Government Rights clause is in lieu of, and supersedes, +any other FAR, DFAR, or other clause or provision that addresses +Government rights in computer software under this License. + +9. MISCELLANEOUS. + +This License represents the complete agreement concerning subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the +extent necessary to make it enforceable. This License shall be +governed by the law of the jurisdiction specified in a notice +contained within the Original Software (except to the extent +applicable law, if any, provides otherwise), excluding such +jurisdiction's conflict-of-law provisions. Any litigation +relating to this License shall be subject to the jurisdiction of +the courts located in the jurisdiction and venue specified in a +notice contained within the Original Software, with the losing +party responsible for costs, including, without limitation, court +costs and reasonable attorneys' fees and expenses. The +application of the United Nations Convention on Contracts for the +International Sale of Goods is expressly excluded. Any law or +regulation which provides that the language of a contract shall +be construed against the drafter shall not apply to this License. +You agree that You alone are responsible for compliance with the +United States export administration regulations (and the export +control laws and regulation of any other countries) when You use, +distribute or otherwise make available any Covered Software. + +10. RESPONSIBILITY FOR CLAIMS. + +As between Initial Developer and the Contributors, each party is +responsible for claims and damages arising, directly or +indirectly, out of its utilization of rights under this License +and You agree to work with Initial Developer and Contributors to +distribute such responsibility on an equitable basis. Nothing +herein is intended or shall be deemed to constitute any admission +of liability. + +NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND +DISTRIBUTION LICENSE (CDDL) + +The code released under the CDDL shall be governed by the laws +of the State of California (excluding conflict-of-law provisions). +Any litigation relating to this License shall be subject to the +jurisdiction of the Federal Courts of the Northern District of +California and the state courts of the State of California, with +venue lying in Santa Clara County, California. + + +The GNU General Public License (GPL) +Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim + copies of this license document, but changing it is not + allowed. + + Preamble + +The licenses for most software are designed to take away +your freedom to share and change it. By contrast, the GNU +General Public License is intended to guarantee your freedom +to share and change free software--to make sure the software +is free for all its users. This General Public License +applies to most of the Free Software Foundation's software +and to any other program whose authors commit to using it. +(Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can +apply it to your programs, too. + +When we speak of free software, we are referring to freedom, +not price. Our General Public Licenses are designed to make +sure that you have the freedom to distribute copies of free +software (and charge for this service if you wish), that you +receive source code or can get it if you want it, that you +can change the software or use pieces of it in new free +programs; and that you know you can do these things. + +To protect your rights, we need to make restrictions that +forbid anyone to deny you these rights or to ask you to +surrender the rights. These restrictions translate to +certain responsibilities for you if you distribute copies of +the software, or if you modify it. + +For example, if you distribute copies of such a program, +whether gratis or for a fee, you must give the recipients +all the rights that you have. You must make sure that they, +too, receive or can get the source code. And you must show +them these terms so they know their rights. + +We protect your rights with two steps: (1) copyright the +software, and (2) offer you this license which gives you +legal permission to copy, distribute and/or modify the +software. + +Also, for each author's protection and ours, we want to make +certain that everyone understands that there is no warranty +for this free software. If the software is modified by +someone else and passed on, we want its recipients to know +that what they have is not the original, so that any +problems introduced by others will not reflect on the +original authors' reputations. + +Finally, any free program is threatened constantly by +software patents. We wish to avoid the danger that +redistributors of a free program will individually obtain +patent licenses, in effect making the program proprietary. +To prevent this, we have made it clear that any patent must +be licensed for everyone's free use or not licensed at all. + +The precise terms and conditions for copying, distribution +and modification follow. + +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND +MODIFICATION + +0. This License applies to any program or other work which +contains a notice placed by the copyright holder saying it +may be distributed under the terms of this General Public +License. The "Program", below, refers to any such program or +work, and a "work based on the Program" means either the +Program or any derivative work under copyright law: that is +to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into +another language. (Hereinafter, translation is included +without limitation in the term "modification".) Each +licensee is addressed as "you". + +Activities other than copying, distribution and modification +are not covered by this License; they are outside its scope. +The act of running the Program is not restricted, and the +output from the Program is covered only if its contents +constitute a work based on the Program (independent of +having been made by running the Program). Whether that is +true depends on what the Program does. + +1. You may copy and distribute verbatim copies of the +Program's source code as you receive it, in any medium, +provided that you conspicuously and appropriately publish on +each copy an appropriate copyright notice and disclaimer of +warranty; keep intact all the notices that refer to this +License and to the absence of any warranty; and give any +other recipients of the Program a copy of this License along +with the Program. + +You may charge a fee for the physical act of transferring a +copy, and you may at your option offer warranty protection +in exchange for a fee. + +2. You may modify your copy or copies of the Program or any +portion of it, thus forming a work based on the Program, and +copy and distribute such modifications or work under the +terms of Section 1 above, provided that you also meet all of +these conditions: + + a) You must cause the modified files to carry prominent + notices stating that you changed the files and the date + of any change. + + b) You must cause any work that you distribute or + publish, that in whole or in part contains or is derived + from the Program or any part thereof, to be licensed as + a whole at no charge to all third parties under the + terms of this License. + + c) If the modified program normally reads commands + interactively when run, you must cause it, when started + running for such interactive use in the most ordinary + way, to print or display an announcement including an + appropriate copyright notice and a notice that there is + no warranty (or else, saying that you provide a + warranty) and that users may redistribute the program + under these conditions, and telling the user how to view + a copy of this License. (Exception: if the Program + itself is interactive but does not normally print such + an announcement, your work based on the Program is not + required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the +Program, and can be reasonably considered independent and +separate works in themselves, then this License, and its +terms, do not apply to those sections when you distribute +them as separate works. But when you distribute the same +sections as part of a whole which is a work based on the +Program, the distribution of the whole must be on the terms +of this License, whose permissions for other licensees +extend to the entire whole, and thus to each and every part +regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights +or contest your rights to work written entirely by you; +rather, the intent is to exercise the right to control the +distribution of derivative or collective works based on the +Program. + +In addition, mere aggregation of another work not based on +the Program with the Program (or with a work based on the +Program) on a volume of a storage or distribution medium +does not bring the other work under the scope of this +License. + +3. You may copy and distribute the Program (or a work based +on it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you +also do one of the following: + + a) Accompany it with the complete corresponding + machine-readable source code, which must be distributed + under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least + three years, to give any third party, for a charge no + more than your cost of physically performing source + distribution, a complete machine-readable copy of the + corresponding source code, to be distributed under the + terms of Sections 1 and 2 above on a medium customarily + used for software interchange; or, + + c) Accompany it with the information you received as to + the offer to distribute corresponding source code. (This + alternative is allowed only for noncommercial + distribution and only if you received the program in + object code or executable form with such an offer, in + accord with Subsection b above.) + +The source code for a work means the preferred form of the +work for making modifications to it. For an executable work, +complete source code means all the source code for all +modules it contains, plus any associated interface +definition files, plus the scripts used to control +compilation and installation of the executable. However, as +a special exception, the source code distributed need not +include anything that is normally distributed (in either +source or binary form) with the major components (compiler, +kernel, and so on) of the operating system on which the +executable runs, unless that component itself accompanies +the executable. + +If distribution of executable or object code is made by +offering access to copy from a designated place, then +offering equivalent access to copy the source code from the +same place counts as distribution of the source code, even +though third parties are not compelled to copy the source +along with the object code. + +4. You may not copy, modify, sublicense, or distribute the +Program except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense or distribute +the Program is void, and will automatically terminate your +rights under this License. However, parties who have +received copies, or rights, from you under this License will +not have their licenses terminated so long as such parties +remain in full compliance. + +5. You are not required to accept this License, since you +have not signed it. However, nothing else grants you +permission to modify or distribute the Program or its +derivative works. These actions are prohibited by law if you +do not accept this License. Therefore, by modifying or +distributing the Program (or any work based on the Program), +you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or +modifying the Program or works based on it. + +6. Each time you redistribute the Program (or any work based +on the Program), the recipient automatically receives a +license from the original licensor to copy, distribute or +modify the Program subject to these terms and conditions. +You may not impose any further restrictions on the +recipients' exercise of the rights granted herein. You are +not responsible for enforcing compliance by third parties to +this License. + +7. If, as a consequence of a court judgment or allegation of +patent infringement or for any other reason (not limited to +patent issues), conditions are imposed on you (whether by +court order, agreement or otherwise) that contradict the +conditions of this License, they do not excuse you from the +conditions of this License. If you cannot distribute so as +to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a +consequence you may not distribute the Program at all. For +example, if a patent license would not permit royalty-free +redistribution of the Program by all those who receive +copies directly or indirectly through you, then the only way +you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or +unenforceable under any particular circumstance, the balance +of the section is intended to apply and the section as a +whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to +infringe any patents or other property right claims or to +contest validity of any such claims; this section has the +sole purpose of protecting the integrity of the free +software distribution system, which is implemented by public +license practices. Many people have made generous +contributions to the wide range of software distributed +through that system in reliance on consistent application of +that system; it is up to the author/donor to decide if he or +she is willing to distribute software through any other +system and a licensee cannot impose that choice. + +This section is intended to make thoroughly clear what is +believed to be a consequence of the rest of this License. + +8. If the distribution and/or use of the Program is +restricted in certain countries either by patents or by +copyrighted interfaces, the original copyright holder who +places the Program under this License may add an explicit +geographical distribution limitation excluding those +countries, so that distribution is permitted only in or +among countries not thus excluded. In such case, this +License incorporates the limitation as if written in the +body of this License. + +9. The Free Software Foundation may publish revised and/or +new versions of the General Public License from time to +time. Such new versions will be similar in spirit to the +present version, but may differ in detail to address new +problems or concerns. + +Each version is given a distinguishing version number. If +the Program specifies a version number of this License which +applies to it and "any later version", you have the option +of following the terms and conditions either of that version +or of any later version published by the Free Software +Foundation. If the Program does not specify a version number +of this License, you may choose any version ever published +by the Free Software Foundation. + +10. If you wish to incorporate parts of the Program into +other free programs whose distribution conditions are +different, write to the author to ask for permission. For +software which is copyrighted by the Free Software +Foundation, write to the Free Software Foundation; we +sometimes make exceptions for this. Our decision will be +guided by the two goals of preserving the free status of all +derivatives of our free software and of promoting the +sharing and reuse of software generally. + +NO WARRANTY + +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS +NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE +COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM +"AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR +IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE +OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE +DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + +12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED +TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY +WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED +ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, +SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF +THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT +LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR +LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE +PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH +HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + +If you develop a new program, and you want it to be of the +greatest possible use to the public, the best way to achieve +this is to make it free software which everyone can +redistribute and change under these terms. + +To do so, attach the following notices to the program. It is +safest to attach them to the start of each source file to +most effectively convey the exclusion of warranty; and each +file should have at least the "copyright" line and a pointer +to where the full notice is found. + + One line to give the program's name and a brief idea of + what it does. Copyright (C) <year> <name of author> + + This program is free software; you can redistribute it + and/or modify it under the terms of the GNU General + Public License as published by the Free Software + Foundation; either version 2 of the License, or (at your + option) any later version. + + This program is distributed in the hope that it will be + useful, but WITHOUT ANY WARRANTY; without even the + implied warranty of MERCHANTABILITY or FITNESS FOR A + PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General + Public License along with this program; if not, write to + the Free Software Foundation, Inc., 59 Temple Place, + Suite 330, Boston, MA 02111-1307 USA + +Also add information on how to contact you by electronic and +paper mail. + +If the program is interactive, make it output a short notice +like this when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of + author Gnomovision comes with ABSOLUTELY NO WARRANTY; + for details type `show w'. This is free software, and + you are welcome to redistribute it under certain + conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show +the appropriate parts of the General Public License. Of +course, the commands you use may be called something other +than `show w' and `show c'; they could even be mouse-clicks +or menu items--whatever suits your program. + +You should also get your employer (if you work as a +programmer) or your school, if any, to sign a "copyright +disclaimer" for the program, if necessary. Here is a sample; +alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in + the program `Gnomovision' (which makes passes at + compilers) written by James Hacker. + + signature of Ty Coon, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating +your program into proprietary programs. If your program is a +subroutine library, you may consider it more useful to +permit linking proprietary applications with the library. If +this is what you want to do, use the GNU Library General +Public License instead of this License. + + +"CLASSPATH" EXCEPTION TO THE GPL VERSION 2 + + +Certain source files distributed by Sun Microsystems, Inc. +are subject to the following clarification and special +exception to the GPL Version 2, but only where Sun has expressly +included in the particular source file's header the words +"Sun designates this particular file as subject to the +"Classpath" exception as provided by Sun in the License file +that accompanied this code." + +Linking this library statically or dynamically with other +modules is making a combined work based on this library. +Thus, the terms and conditions of the GNU General Public +License Version 2 cover the whole combination. + +As a special exception, the copyright holders of this +library give you permission to link this library with +independent modules to produce an executable, regardless of +the license terms of these independent modules, and to copy +and distribute the resulting executable under terms of your +choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license +of that module. An independent module is a module which is +not derived from or based on this library. If you modify +this library, you may extend this exception to your version +of the library, but you are not obligated to do so. If you +do not wish to do so, delete this exception statement from +your version. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          568. arusinha opened a new pull request #190: [NETBEANS-54] Module Review o.apache.commons.io URL: https://github.com/apache/incubator-netbeans/pull/190 Added maven coordinate for external resource commons-io-1.4.jar ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          569. geertjanw commented on issue #187: [NETBEANS-54] adding schema2beans test data to Rat exceptions URL: https://github.com/apache/incubator-netbeans/pull/187#issuecomment-338976315 OK, these updates are modifications to the existing Rat exclusions, and a simplification of part of it, only the build.xml is impacted by this commit, and only the Rat exclusion section in there. These changes should bring the problematic files down to about 500. Merging this now. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          570. geertjanw closed pull request #187: [NETBEANS-54] adding schema2beans test data to Rat exceptions URL: https://github.com/apache/incubator-netbeans/pull/187 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/nbbuild/build.xml b/nbbuild/build.xml index bb109b29c..84448511b 100644 --- a/nbbuild/build.xml +++ b/nbbuild/build.xml @@ -1991,44 +1991,23 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <exclude name="**/nbproject/private/**" /> <!--user-specific files --> <exclude name="**/src/META-INF/**" /> <!--no degree of creativity--> <exclude name="*/build/**" /> - <exclude name="api.search/test/unit/data/textFiles/utf8file.txt" /> <!--test data--> - <exclude name="api.search/test/unit/src/org/netbeans/modules/search/data/**" /> <!--test data--> + <exclude name="*/test/unit/data/**" /> + <exclude name="*/test/qa-functional/data/**" /> <exclude name="beans/src/org/netbeans/modules/beans/resources/templates/*.template" /> <!--license would be visible when users edit the templates inside their IDE--> <exclude name="css.editor/src/org/netbeans/modules/css/resources/CascadeStyleSheet.css.template" /> <!-- user visible template --> <exclude name="css.editor/src/org/netbeans/modules/css/resources/CssExample" /> <!-- user visible template --> - <exclude name="css.editor/test/unit/data/testfiles/**" /> <!--simple files for testing--> <exclude name="css.editor/todo" /> <!-- no degree of creativity --> - <exclude name="css.lib/test/unit/data/**" /> <!--test data--> - <exclude name="css.prep/test/qa-functional/data/css_prep/public_html/**" /> <!--simple files for testing--> - <exclude name="css.prep/test/unit/data/testFiles/test.less" /> <!--simple file forss testing--> - <exclude name="css.prep/test/unit/data/testFiles/testIssue227676.scss" /> <!--simple file for testing--> - <exclude name="css.prep/test/unit/data/testProject/public_html/*" /> <!--simple files for testing--> <exclude name="debugger.jpda/test/unit/src/org/netbeans/api/debugger/jpda/testapps/JspLineBreakpointApp.txt" /> <!-- test data --> - <exclude name="diff/test/unit/data/**" /> <!--test data--> <exclude name="diff/test/unit/src/org/netbeans/modules/diff/builtin/provider/*.txt" /> <!--test data--> - <exclude name="diff/test/unit/src/org/netbeans/modules/diff/builtin/visualizer/data/**" /> <!--test data--> - <exclude name="editor.fold/test/unit/data/goldenfiles/hierarchy/update-hierarchy.folds" /> <!--test data--> - <exclude name="editor.fold/test/unit/data/hierarchy/update-hierarchy.folds" /> <!--test data--> <exclude name="editor.fold/test/unit/src/org/netbeans/modules/editor/fold/FoldContentReader.txt" /> <!--test data--> <exclude name="editor.plain/src/org/netbeans/modules/editor/plain/resources/PlainTextExample" /> <!--license would be visible to users in the Fonts/Colors settings--> <exclude name="editor.settings.storage/test/unit/src/org/netbeans/modules/editor/settings/storage/compatibility/p1/**" /> <!--test data--> - <exclude name="extbrowser/test/unit/src/org/netbeans/modules/extbrowser/data/mac_defaults_*" /> <!--test data--> - <exclude name="form/test/unit/data/goldenfiles/*" /> <!--test data--> <exclude name="hibernate/src/org/netbeans/modules/hibernate/resources/Hibernate*.xml" /> <!--template files--> <exclude name="hibernate/src/org/netbeans/modules/hibernate/resources/HibernateUtil.javax" /> <!--template file--> - <exclude name="html.lexer/test/unit/data/testfiles/*" /> <!--test data--> <exclude name="hudson.subversion/test/unit/src/org/netbeans/modules/hudson/subversion/sample-entries-file" /> <!--test data--> - <exclude name="ide.kit/test/qa-functional/**/*.txt" /> <!-- test data --> <exclude name="java.api.common/src/org/netbeans/modules/java/api/common/project/ui/customizer/vmo/gen/CommandLine.tokens" /> <!--generated by ANTLR--> - <exclude name="java.editor.base/test/unit/data/**" /> <!--test data--> <exclude name="java.editor/src/org/netbeans/modules/java/editor/resources/JavaExample" /> <!--no degree of creativity--> - <exclude name="java.editor/test/qa-functional/data/**" /> <!--test data--> - <exclude name="java.editor/test/unit/data/**" /> <!--test data--> <exclude name="java.j2semodule/src/org/netbeans/modules/java/j2semodule/ui/resources/module-info.java.template" /> <!--template file--> - <exclude name="java.lexer/test/unit/data/testfiles/*" /> <!--test data--> - <exclude name="javadoc/test/unit/data/docs_jdk14_ja/api/index-files/**" /> <!--test data--> - <exclude name="javafx2.editor/test/unit/data/goldenfiles/org/netbeans/modules/javafx2/editor/completion/impl/**/*.out*" /> - <exclude name="javafx2.editor/test/unit/data/org/netbeans/modules/javafx2/editor/**/*.fxml" /> <exclude name="javafx2.kit/release/VERSION.txt" /> <!--generated file--> <exclude name="javafx2.project/src/org/netbeans/modules/javafx2/project/templates/**" /> <!--license would be visible when users edit the templates inside their IDE--> <exclude name="javawebstart/AntTasks/build/**" /> <!-- generated build files --> @@ -2036,25 +2015,18 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <exclude name="languages.diff/src/org/netbeans/modules/languages/diff/DiffExample.diff" /> <!--license would be visible to users in the Fonts/Colors settings--> <exclude name="languages.yaml/src/org/netbeans/modules/languages/yaml/*.yaml" /> <!--Files used in GUI as sample/starting point--> <exclude name="languages.yaml/src/org/netbeans/modules/languages/yaml/*.yml" /> <!--Files used in GUI as sample/starting point--> - <exclude name="languages.yaml/test/unit/data/testfiles/*" /> <!--test data--> - <exclude name="libs.freemarker/test/unit/data/**" /> <!--test data--> + <exclude name="lib.uihandler/test/unit/src/**" /> <!--test data--> <exclude name="mercurial/src/org/netbeans/modules/mercurial/util/log*" /> <!-- user templates for mercurial commits, etc. --> - <exclude name="mercurial/test/qa-functional/data/files/**"/> <!-- qa test data --> - <exclude name="mercurial/test/unit/data/**" /> <!-- unit test data --> <exclude name="nbbuild/netbeans/**" /> + <exclude name="nbbuild/testuserdir/**" /> <exclude name="o.apache.tools.ant.module/release/VERSION.txt" /> <!--generated file--> <exclude name="o.apache.tools.ant.module/src/org/apache/tools/ant/module/resources/CustomTask_java" /> <!-- user visible file template --> <exclude name="o.apache.tools.ant.module/src/org/apache/tools/ant/module/resources/Project.xml_" /> <!-- user visible file template --> - <exclude name="o.apache.tools.ant.module/test/unit/data/**/*.properties" /> <!--test data--> - <exclude name="o.apache.tools.ant.module/test/unit/data/**/*.xml" /> <!--test data--> <exclude name="options.editor/src/org/netbeans/modules/options/colors/AllLanguagesExample" /> <!--no degree of creativitya--> <exclude name="options.editor/src/org/netbeans/modules/options/colors/HighlightingExample" /> <!--no degree of creativitya--> <exclude name="options.editor/src/org/netbeans/modules/options/indentation/indentationExample" /> <!--no degree of creativitya--> - <exclude name="projectimport.eclipse.core/test/unit/data/**" /> <!--test data--> <exclude name="projectui/src/org/netbeans/modules/project/ui/resources/*-license.txt" /> <!--licenses--> <exclude name="projectui/src/org/netbeans/modules/project/ui/resources/license-default.txt" /> <!--licenses--> - <exclude name="projectuiapi/test/unit/data/*.txt" /> <!--test data--> - <exclude name="projectuiapi/test/unit/src/org/netbeans/modules/project/uiapi/data/*.txt" /> <!--test data--> <exclude name="selenium2.java/src/org/netbeans/modules/selenium2/java/SeleneseIT.java.template" /> <!--template file--> <exclude name="spellchecker.dictionary_en/release/modules/dict/*.description" /> <!--Description Files--> <exclude name="spi.navigator/test/unit/src/org/netbeans/modules/navigator/resources/lastsel/file.lastsel_mime1" /> <!--empty file--> @@ -2062,13 +2034,6 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <exclude name="templates/src/org/netbeans/modules/templates/resources/userprop.txt" /> <!--no degree of creativity--> <exclude name="testng.ui/src/org/netbeans/modules/testng/ui/resources/*.template" /> <!--template files--> <exclude name="utilities/test/unit/src/org/netbeans/modules/openfile/resources/recent_files/*" /> <!--test data--> - <exclude name="versioning.core/test/unit/data/workdir/root-test-versioned/**" /> <!--test data--> - <exclude name="versioning.core/test/unit/data/workdir/root-with-exclusions/**" /> <!--test data--> - <exclude name="versioning.core/test/unit/data/workdir/root/a.txt" /> <!--test data--> - <exclude name="versioning.util/test/unit/data/historycache/*" /> <!--test data--> - <exclude name="versioning/test/unit/data/workdir/root-test-versioned/**" /> <!--test data--> - <exclude name="versioning/test/unit/data/workdir/root-with-exclusions/**" /> <!--test data--> - <exclude name="versioning/test/unit/data/workdir/root/a.txt" /> <!--test data--> <exclude name="websvc.saas.api/src/org/netbeans/modules/websvc/saas/oauth/*.template" /> <!--template files--> <exclude name="websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/model/application.wadl" /> <!--test data--> <exclude name="websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/util/rootGroup.xml" /> <!--test data--> @@ -2083,7 +2048,6 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <exclude name="xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/resources/dummyProject/nbproject/private/tmpfile" /> <!-- test data --> <exclude name="xml.text/src/org/netbeans/modules/xml/text/resources/DTDExample" /> <!-- GUI sample file to demonstrate syntax highlighting --> <exclude name="xml.text/src/org/netbeans/modules/xml/text/resources/XMLExample" /> <!-- GUI sample file to demonstrate syntax highlighting --> - <exclude name="xml.text/test/qa-functional/src/org/netbeans/modules/xml/text/**/data/**" /> <!-- test data --> <exclude name="xml.tools/test/qa-functional/src/org/netbeans/modules/**/*.dtd" /> <!-- test data --> <exclude name="xml.tools/test/qa-functional/src/org/netbeans/modules/**/*.txt" /> <!-- test data --> <exclude name="xml.tools/test/qa-functional/src/org/netbeans/modules/**/*.xml" /> <!-- test data --> @@ -2097,7 +2061,6 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <exclude name="xml/src/org/netbeans/modules/xml/resources/templates/*" /> <!-- template files - tracked by https://issues.apache.org/jira/browse/NETBEANS-85 --> <exclude name="xml/test/unit/src/org/netbeans/modules/xml/resources/*" /> <!-- test data --> <exclude name="xsl/src/org/netbeans/modules/xsl/resources/templates/stylesheet.xsl" /> <!-- Template for user - very limited degree of creativity --> - <exclude name="xsl/test/unit/src/org/netbeans/modules/xsl/utils/data/*" /> <!--test data--> </patternset> <rat:report xmlns:rat="antlib:org.apache.rat.anttasks" reportfile="build/rat-report.txt"> <rat:substringMatcher licenseFamilyCategory="w3c2" licenseFamilyName="W3C Software and Document Notice and License"> ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          571. geertjanw commented on issue #178: [NETBEANS-54] Module Review schema2beans URL: https://github.com/apache/incubator-netbeans/pull/178#issuecomment-338976933 Will create low-prio ticket and have excluded these files via Rat exclusions, so closing this PR. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          572. geertjanw closed pull request #178: [NETBEANS-54] Module Review schema2beans URL: https://github.com/apache/incubator-netbeans/pull/178 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/schema2beans/src/org/netbeans/modules/schema2beansdev/metadd/gen.ksh b/schema2beans/src/org/netbeans/modules/schema2beansdev/metadd/gen.ksh index 6aa724677..eb92046bf 100644 --- a/schema2beans/src/org/netbeans/modules/schema2beansdev/metadd/gen.ksh +++ b/schema2beans/src/org/netbeans/modules/schema2beansdev/metadd/gen.ksh @@ -1 +1,16 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. ant genmetadd diff --git a/schema2beans/test/unit/data/TestApplication1_4.xml b/schema2beans/test/unit/data/TestApplication1_4.xml index 8eb151708..088730321 100644 --- a/schema2beans/test/unit/data/TestApplication1_4.xml +++ b/schema2beans/test/unit/data/TestApplication1_4.xml @@ -1,4 +1,24 @@ <?xml version='1.0' encoding='UTF-8' ?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <application xmlns='http://java.sun.com/xml/ns/j2ee' version='1.4'> <display-name>test app</display-name> <module> diff --git a/schema2beans/test/unit/data/TestAttr.dtd b/schema2beans/test/unit/data/TestAttr.dtd index 9f4557fb0..3338e62d9 100644 --- a/schema2beans/test/unit/data/TestAttr.dtd +++ b/schema2beans/test/unit/data/TestAttr.dtd @@ -1,4 +1,24 @@ -<!-- The following DTD is a simple view of a book: +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + + The following DTD is a simple view of a book: + book index + diff --git a/schema2beans/test/unit/data/TestAttr.xml b/schema2beans/test/unit/data/TestAttr.xml index c2b5e1b19..fdafb27fe 100644 --- a/schema2beans/test/unit/data/TestAttr.xml +++ b/schema2beans/test/unit/data/TestAttr.xml @@ -1,5 +1,24 @@ <?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <book good="no"> <summary size="12" lang="en" length="132"> This book is about the life of a book spent between books who dreamed diff --git a/schema2beans/test/unit/data/TestBadNames.xml b/schema2beans/test/unit/data/TestBadNames.xml index 47f97140d..bedb74bdf 100644 --- a/schema2beans/test/unit/data/TestBadNames.xml +++ b/schema2beans/test/unit/data/TestBadNames.xml @@ -1,4 +1,24 @@ <?xml version="1.0" ?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <bad-names> <el class="c" package="p"> <property>-9</property> diff --git a/schema2beans/test/unit/data/TestBadNames.xsd b/schema2beans/test/unit/data/TestBadNames.xsd index 28473c30f..a080bf895 100644 --- a/schema2beans/test/unit/data/TestBadNames.xsd +++ b/schema2beans/test/unit/data/TestBadNames.xsd @@ -1,5 +1,24 @@ <?xml version="1.0" ?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"> <element name="bad-names"> <complexType> diff --git a/schema2beans/test/unit/data/TestBeanWrapper.mdd b/schema2beans/test/unit/data/TestBeanWrapper.mdd index 403502f66..7be04c8df 100644 --- a/schema2beans/test/unit/data/TestBeanWrapper.mdd +++ b/schema2beans/test/unit/data/TestBeanWrapper.mdd @@ -1,4 +1,24 @@ <?xml version='1.0' encoding='UTF-8' ?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <metaDD> <meta-element> <dtd-name>namespaceSample</dtd-name> diff --git a/schema2beans/test/unit/data/TestBook.dtd b/schema2beans/test/unit/data/TestBook.dtd index 17d40c9ef..9892aa07b 100644 --- a/schema2beans/test/unit/data/TestBook.dtd +++ b/schema2beans/test/unit/data/TestBook.dtd @@ -1,4 +1,24 @@ -<!-- The following DTD is a simple view of a book: +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + + The following DTD is a simple view of a book: + book index + diff --git a/schema2beans/test/unit/data/TestBook.xml b/schema2beans/test/unit/data/TestBook.xml index b9b76bbbe..8ac5083cb 100644 --- a/schema2beans/test/unit/data/TestBook.xml +++ b/schema2beans/test/unit/data/TestBook.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <book> <summary> This book is about the life of a book spent between books who dreamed diff --git a/schema2beans/test/unit/data/TestBookXMLSchema.xml b/schema2beans/test/unit/data/TestBookXMLSchema.xml index b9b76bbbe..8ac5083cb 100644 --- a/schema2beans/test/unit/data/TestBookXMLSchema.xml +++ b/schema2beans/test/unit/data/TestBookXMLSchema.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <book> <summary> This book is about the life of a book spent between books who dreamed diff --git a/schema2beans/test/unit/data/TestBookXMLSchema.xsd b/schema2beans/test/unit/data/TestBookXMLSchema.xsd index 41658002c..dc7359a24 100644 --- a/schema2beans/test/unit/data/TestBookXMLSchema.xsd +++ b/schema2beans/test/unit/data/TestBookXMLSchema.xsd @@ -1,5 +1,24 @@ <?xml version="1.0" ?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"> <xsd:element name="book"> <xsd:complexType> diff --git a/schema2beans/test/unit/data/TestChameleonIncludeDependency.xsd b/schema2beans/test/unit/data/TestChameleonIncludeDependency.xsd index 81cba2835..86a59de52 100644 --- a/schema2beans/test/unit/data/TestChameleonIncludeDependency.xsd +++ b/schema2beans/test/unit/data/TestChameleonIncludeDependency.xsd @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified"> diff --git a/schema2beans/test/unit/data/TestChameleonIncludeMain.xsd b/schema2beans/test/unit/data/TestChameleonIncludeMain.xsd index 4d0383826..5f57de96e 100644 --- a/schema2beans/test/unit/data/TestChameleonIncludeMain.xsd +++ b/schema2beans/test/unit/data/TestChameleonIncludeMain.xsd @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <schema targetNamespace="http://test.org/test" xmlns:test="http://test.org/test" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" diff --git a/schema2beans/test/unit/data/TestContrivedApp.dtd b/schema2beans/test/unit/data/TestContrivedApp.dtd index de7f639cc..10bfd9578 100644 --- a/schema2beans/test/unit/data/TestContrivedApp.dtd +++ b/schema2beans/test/unit/data/TestContrivedApp.dtd @@ -1,3 +1,23 @@ +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!ELEMENT application (display-name, description, module)> <!ELEMENT module (ejb, alt-dd)> <!ELEMENT display-name #PCDATA> diff --git a/schema2beans/test/unit/data/TestContrivedApp.mdd b/schema2beans/test/unit/data/TestContrivedApp.mdd index 21f95891a..1cb67f3f3 100644 --- a/schema2beans/test/unit/data/TestContrivedApp.mdd +++ b/schema2beans/test/unit/data/TestContrivedApp.mdd @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <metaDD> <throw-exceptions/> <meta-element> diff --git a/schema2beans/test/unit/data/TestContrivedApp.xml b/schema2beans/test/unit/data/TestContrivedApp.xml index 87387c10b..f41cf5b97 100644 --- a/schema2beans/test/unit/data/TestContrivedApp.xml +++ b/schema2beans/test/unit/data/TestContrivedApp.xml @@ -1,5 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE application PUBLIC "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN" "http://java.sun.com/dtd/application_1_3.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <application> <display-name>Application_EJBModule_Entity2</display-name> <description>J2EE Application &amp; &lt; &gt;Application_EJBModule_Entity2<![CDATA[<>&"']]></description> diff --git a/schema2beans/test/unit/data/TestDupInternalNames.xsd b/schema2beans/test/unit/data/TestDupInternalNames.xsd index f9534bd3d..3387d2310 100644 --- a/schema2beans/test/unit/data/TestDupInternalNames.xsd +++ b/schema2beans/test/unit/data/TestDupInternalNames.xsd @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <xs:schema targetNamespace="http://multitrode.com/config" xmlns="http://multitrode.com/config" xmlns:xs="http://www.w3.org/2001/XMLSchema" diff --git a/schema2beans/test/unit/data/TestEmpty.dtd b/schema2beans/test/unit/data/TestEmpty.dtd index c8bf58215..a0fa78c3e 100644 --- a/schema2beans/test/unit/data/TestEmpty.dtd +++ b/schema2beans/test/unit/data/TestEmpty.dtd @@ -1 +1,21 @@ +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!ELEMENT EmptyElement EMPTY> diff --git a/schema2beans/test/unit/data/TestEncoding.dtd b/schema2beans/test/unit/data/TestEncoding.dtd index 480e13f8d..0d1d7333e 100644 --- a/schema2beans/test/unit/data/TestEncoding.dtd +++ b/schema2beans/test/unit/data/TestEncoding.dtd @@ -1,3 +1,23 @@ +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!ELEMENT FORTEDDL (PHASE+)> <!ELEMENT PHASE (ATTRIBUTE, ANNOTATION*)*> diff --git a/schema2beans/test/unit/data/TestEncoding.xml b/schema2beans/test/unit/data/TestEncoding.xml index 6cac170d3..b04c97afc 100644 --- a/schema2beans/test/unit/data/TestEncoding.xml +++ b/schema2beans/test/unit/data/TestEncoding.xml @@ -1,18 +1,38 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!-- ex1.xml --> -<!-- This is a simple XML source file. Object class metamethod --> -<!-- m3 includes 8-bit ASCII text, with a tilde-n and accent-e --> -<!-- characters embedded, to test the UTF8->native codeset --> -<!-- conversion feature of the SAX expat driver. As long as this --> -<!-- test is run under ISO-8859-1 localization, test output should--> -<!-- be identical to test input, with one odd byte representing --> -<!-- each of these 8-bit characters. --> -<!-- --> -<!-- The vi editor on Sun Solaris displays the two odd characters --> -<!-- as \161 and \151. --> -<!-- --> +<!-- -<!-- <!DOCTYPE FORTEDDL SYSTEM "TestEncoding.dtd" []> --> + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + + ex1.xml + This is a simple XML source file. Object class metamethod + m3 includes 8-bit ASCII text, with a tilde-n and accent-e + characters embedded, to test the UTF8->native codeset + conversion feature of the SAX expat driver. As long as this + test is run under ISO-8859-1 localization, test output should + be identical to test input, with one odd byte representing + each of these 8-bit characters. + + The vi editor on Sun Solaris displays the two odd characters + as \161 and \151. + + <!DOCTYPE FORTEDDL SYSTEM "TestEncoding.dtd" []> + +--> <FORTEDDL> <PHASE OBJECTTYPE="MetaPlan.MetaClass" OBJECTNAME="c1" NUMBER="1"> <ATTRIBUTE NAME="Name">c1</ATTRIBUTE> diff --git a/schema2beans/test/unit/data/TestEvents.dtd b/schema2beans/test/unit/data/TestEvents.dtd index 4ae0b5344..508ef8054 100644 --- a/schema2beans/test/unit/data/TestEvents.dtd +++ b/schema2beans/test/unit/data/TestEvents.dtd @@ -1,4 +1,24 @@ -<!-- The following DTD is a simple view of a book: +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + + The following DTD is a simple view of a book: + book index + diff --git a/schema2beans/test/unit/data/TestExceptions.dtd b/schema2beans/test/unit/data/TestExceptions.dtd index 96535c8d3..95ad15272 100644 --- a/schema2beans/test/unit/data/TestExceptions.dtd +++ b/schema2beans/test/unit/data/TestExceptions.dtd @@ -1,3 +1,23 @@ +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!ELEMENT EXCEPS BLUE?, GREEN?> <!ELEMENT BLUE #PCDATA> diff --git a/schema2beans/test/unit/data/TestExceptions.mdd b/schema2beans/test/unit/data/TestExceptions.mdd index ef48acee3..2cfa67e35 100644 --- a/schema2beans/test/unit/data/TestExceptions.mdd +++ b/schema2beans/test/unit/data/TestExceptions.mdd @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <metaDD> <throw-exceptions/> <meta-element> diff --git a/schema2beans/test/unit/data/TestExceptions.xml b/schema2beans/test/unit/data/TestExceptions.xml index 011e39199..72643f8ab 100644 --- a/schema2beans/test/unit/data/TestExceptions.xml +++ b/schema2beans/test/unit/data/TestExceptions.xml @@ -1,2 +1,22 @@ <?xml version='1.0'?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <foo/> diff --git a/schema2beans/test/unit/data/TestExtension.xsd b/schema2beans/test/unit/data/TestExtension.xsd index 85dd2ecbc..b0129a662 100644 --- a/schema2beans/test/unit/data/TestExtension.xsd +++ b/schema2beans/test/unit/data/TestExtension.xsd @@ -1,5 +1,24 @@ <?xml version="1.0" ?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:complexType name="ComplexFunSpec"> diff --git a/schema2beans/test/unit/data/TestExtension2.xsd b/schema2beans/test/unit/data/TestExtension2.xsd index b48d780d2..4213f73e2 100644 --- a/schema2beans/test/unit/data/TestExtension2.xsd +++ b/schema2beans/test/unit/data/TestExtension2.xsd @@ -1,5 +1,24 @@ <?xml version="1.0" ?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:element name='mycar' type='car'/> diff --git a/schema2beans/test/unit/data/TestExtensionSample.xsd b/schema2beans/test/unit/data/TestExtensionSample.xsd index b3ea48bdb..fed5f0e13 100644 --- a/schema2beans/test/unit/data/TestExtensionSample.xsd +++ b/schema2beans/test/unit/data/TestExtensionSample.xsd @@ -1,5 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://anything.org/extension" diff --git a/schema2beans/test/unit/data/TestFind.dtd b/schema2beans/test/unit/data/TestFind.dtd index 258155196..09b69cad3 100644 --- a/schema2beans/test/unit/data/TestFind.dtd +++ b/schema2beans/test/unit/data/TestFind.dtd @@ -1,5 +1,26 @@ -<!-- The following DTD is a simple view of a book: -book +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + + The following DTD is a simple view of a book: + + book + index + word diff --git a/schema2beans/test/unit/data/TestGroupUnbounded.java b/schema2beans/test/unit/data/TestGroupUnbounded.java index 1cb1d2089..e2bf10536 100644 --- a/schema2beans/test/unit/data/TestGroupUnbounded.java +++ b/schema2beans/test/unit/data/TestGroupUnbounded.java @@ -1,42 +1,20 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved. + * http://www.apache.org/licenses/LICENSE-2.0 * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * Contributor(s): - * - * The Original Software is NetBeans. The Initial Developer of the original - * Code is Sun Microsystems, Inc. PGroupUnboundedtions Copyright 1997-2006 Sun - * Microsystems, Inc. All Rights Reserved. - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ import java.io.*; diff --git a/schema2beans/test/unit/data/TestGroupUnbounded.xsd b/schema2beans/test/unit/data/TestGroupUnbounded.xsd index 51ebc084e..b3b7dadec 100644 --- a/schema2beans/test/unit/data/TestGroupUnbounded.xsd +++ b/schema2beans/test/unit/data/TestGroupUnbounded.xsd @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://foo.com/xml/group-unbounded" diff --git a/schema2beans/test/unit/data/TestIncludeDependency.xsd b/schema2beans/test/unit/data/TestIncludeDependency.xsd index 3d82fd0a6..b2a526ff5 100644 --- a/schema2beans/test/unit/data/TestIncludeDependency.xsd +++ b/schema2beans/test/unit/data/TestIncludeDependency.xsd @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <schema targetNamespace="http://test.org/test" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:test="http://test.org/test" diff --git a/schema2beans/test/unit/data/TestIncludeMain.xsd b/schema2beans/test/unit/data/TestIncludeMain.xsd index 74efcf894..4598e783f 100644 --- a/schema2beans/test/unit/data/TestIncludeMain.xsd +++ b/schema2beans/test/unit/data/TestIncludeMain.xsd @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <xs:schema targetNamespace="http://test.org/test" xmlns:test="http://test.org/test" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" diff --git a/schema2beans/test/unit/data/TestInvoice.xsd b/schema2beans/test/unit/data/TestInvoice.xsd index 57c33d346..58d1a830c 100644 --- a/schema2beans/test/unit/data/TestInvoice.xsd +++ b/schema2beans/test/unit/data/TestInvoice.xsd @@ -1,4 +1,24 @@ <?xml version="1.0"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" > <xsd:annotation> diff --git a/schema2beans/test/unit/data/TestMdd.dtd b/schema2beans/test/unit/data/TestMdd.dtd index 9e863279e..a72d81ed5 100644 --- a/schema2beans/test/unit/data/TestMdd.dtd +++ b/schema2beans/test/unit/data/TestMdd.dtd @@ -1,4 +1,24 @@ -<!-- The following DTD is a simple view of a book: +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + + The following DTD is a simple view of a book: + Index[1,n] Alpha - String Word - String diff --git a/schema2beans/test/unit/data/TestMdd.mdd b/schema2beans/test/unit/data/TestMdd.mdd index 9d8a4b375..c6fd4321d 100644 --- a/schema2beans/test/unit/data/TestMdd.mdd +++ b/schema2beans/test/unit/data/TestMdd.mdd @@ -1,5 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <metaDD> <meta-element> <bean-name>Word</bean-name> diff --git a/schema2beans/test/unit/data/TestMerge.dtd b/schema2beans/test/unit/data/TestMerge.dtd index 7fab95c25..3a58e7579 100644 --- a/schema2beans/test/unit/data/TestMerge.dtd +++ b/schema2beans/test/unit/data/TestMerge.dtd @@ -1,4 +1,23 @@ -<!-- The following DTD is a simple view of a book: +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + + The following DTD is a simple view of a book: Tree: book title diff --git a/schema2beans/test/unit/data/TestMergeExtendBaseBean.dtd b/schema2beans/test/unit/data/TestMergeExtendBaseBean.dtd index f50fb6e12..68cf9bd68 100644 --- a/schema2beans/test/unit/data/TestMergeExtendBaseBean.dtd +++ b/schema2beans/test/unit/data/TestMergeExtendBaseBean.dtd @@ -1,4 +1,23 @@ -<!-- The following DTD is a simple view of a book: +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + + The following DTD is a simple view of a book: Tree: book title diff --git a/schema2beans/test/unit/data/TestNamespace.xsd b/schema2beans/test/unit/data/TestNamespace.xsd index 63798c0b1..dac3bc00a 100644 --- a/schema2beans/test/unit/data/TestNamespace.xsd +++ b/schema2beans/test/unit/data/TestNamespace.xsd @@ -1,5 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://anything.org/extension" diff --git a/schema2beans/test/unit/data/TestOr.dtd b/schema2beans/test/unit/data/TestOr.dtd index 0511b10d8..dbef4a6f8 100644 --- a/schema2beans/test/unit/data/TestOr.dtd +++ b/schema2beans/test/unit/data/TestOr.dtd @@ -1,3 +1,23 @@ +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!ELEMENT top cache-mapping> <!-- <!ELEMENT cache-mapping (servlet-name | url-pattern), (cache-helper-ref)> --> <!ELEMENT cache-mapping (servlet-name | url-pattern), (cache-helper-ref | (timeout?, http-method*, key-field*, (a | b), constraint-field*))> diff --git a/schema2beans/test/unit/data/TestPositions.dtd b/schema2beans/test/unit/data/TestPositions.dtd index 8197b2fcb..87d8d39b8 100644 --- a/schema2beans/test/unit/data/TestPositions.dtd +++ b/schema2beans/test/unit/data/TestPositions.dtd @@ -1,3 +1,23 @@ +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!ELEMENT menus (menu*, foo)> <!ELEMENT menu (name, (menu-item | separator | menu)*)> diff --git a/schema2beans/test/unit/data/TestValid.dtd b/schema2beans/test/unit/data/TestValid.dtd index 015730da0..f0a933967 100644 --- a/schema2beans/test/unit/data/TestValid.dtd +++ b/schema2beans/test/unit/data/TestValid.dtd @@ -1,3 +1,23 @@ +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!ELEMENT book (title?, chapter+, note?, paperback?, summary?, isbn?, price?)> <!ELEMENT title (#PCDATA)> <!ELEMENT chapter (title, summary?, paragraph*, conclusion?, ending?)> diff --git a/schema2beans/test/unit/data/TestValid.xml b/schema2beans/test/unit/data/TestValid.xml index 24b8fc4c0..30c648708 100644 --- a/schema2beans/test/unit/data/TestValid.xml +++ b/schema2beans/test/unit/data/TestValid.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="ISO-8859-1" standalone="yes"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!DOCTYPE book [ <!ELEMENT book (title?, chapter+, note?, paperback?, summary?, isbn?, price?)> <!ELEMENT title (#PCDATA)> diff --git a/schema2beans/test/unit/data/TestVeto.dtd b/schema2beans/test/unit/data/TestVeto.dtd index 7554f81b6..7d636fe64 100644 --- a/schema2beans/test/unit/data/TestVeto.dtd +++ b/schema2beans/test/unit/data/TestVeto.dtd @@ -1,5 +1,25 @@ -<!-- The following DTD is a simple view of a book: -book +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + + The following DTD is a simple view of a book: + + book index + word diff --git a/schema2beans/test/unit/data/TestVeto.mdd b/schema2beans/test/unit/data/TestVeto.mdd index ccafec096..9af9d1965 100644 --- a/schema2beans/test/unit/data/TestVeto.mdd +++ b/schema2beans/test/unit/data/TestVeto.mdd @@ -1,5 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <metaDD> <meta-element> <dtd-name>summary</dtd-name> diff --git a/schema2beans/test/unit/data/TestWebApp.mdd b/schema2beans/test/unit/data/TestWebApp.mdd index f5c6272d5..1573f8330 100644 --- a/schema2beans/test/unit/data/TestWebApp.mdd +++ b/schema2beans/test/unit/data/TestWebApp.mdd @@ -1,4 +1,24 @@ <?xml version='1.0' encoding='UTF-8' ?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <metaDD> <meta-element> <dtd-name>web-app</dtd-name> diff --git a/schema2beans/test/unit/data/TestWebAppDelegator.xml b/schema2beans/test/unit/data/TestWebAppDelegator.xml index 31bdd2c9d..8b31204f8 100644 --- a/schema2beans/test/unit/data/TestWebAppDelegator.xml +++ b/schema2beans/test/unit/data/TestWebAppDelegator.xml @@ -1,4 +1,24 @@ <?xml version='1.0'?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <web-app> <description>This is my Web App</description> <display-name>MyWebApp</display-name> diff --git a/schema2beans/test/unit/data/TestWebAppDelegatorBaseBean.xml b/schema2beans/test/unit/data/TestWebAppDelegatorBaseBean.xml index 06d97e3c7..73d5c6a87 100644 --- a/schema2beans/test/unit/data/TestWebAppDelegatorBaseBean.xml +++ b/schema2beans/test/unit/data/TestWebAppDelegatorBaseBean.xml @@ -1,4 +1,24 @@ <?xml version='1.0'?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <web-app> <description>This is my Web App</description> <display-name>MyWebApp</display-name> diff --git a/schema2beans/test/unit/data/tm01_g1.xml b/schema2beans/test/unit/data/tm01_g1.xml index b93b3bab9..cd89b1200 100644 --- a/schema2beans/test/unit/data/tm01_g1.xml +++ b/schema2beans/test/unit/data/tm01_g1.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <book> <author> John Smith diff --git a/schema2beans/test/unit/data/tm01_g2.xml b/schema2beans/test/unit/data/tm01_g2.xml index 0c87248b1..99551e42c 100644 --- a/schema2beans/test/unit/data/tm01_g2.xml +++ b/schema2beans/test/unit/data/tm01_g2.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <book> <summary size="12"> This book is about the life of a book spent between books who dreamed diff --git a/schema2beans/test/unit/data/tm01_g3.xml b/schema2beans/test/unit/data/tm01_g3.xml index 3ea4c2dea..26e4acfa6 100644 --- a/schema2beans/test/unit/data/tm01_g3.xml +++ b/schema2beans/test/unit/data/tm01_g3.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <book good="no"> <summary length="123" lang="us" size="12"> This book is about the life of a book spent between books who dreamed diff --git a/schema2beans/test/unit/data/tm01_g4.xml b/schema2beans/test/unit/data/tm01_g4.xml index 2ae408e04..0e7160e15 100644 --- a/schema2beans/test/unit/data/tm01_g4.xml +++ b/schema2beans/test/unit/data/tm01_g4.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <book good="no"> <!-- BLUE --> <summary length="123" lang="us" size="12"> ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          573. bolsover commented on issue #172: [NETBEANS-54] Module Review o.apache.xml.resolver URL: https://github.com/apache/incubator-netbeans/pull/172#issuecomment-339001084 I'll quite happily do some testing... Where do I get the 'patch' utility? ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          574. geertjanw commented on issue #117: [NETBEANS-54] Modeule Review j2ee.persistence URL: https://github.com/apache/incubator-netbeans/pull/117#issuecomment-339002802 I see about 15 files in j2ee.persistence that have problematic license headers (or none) of some kind: https://builds.apache.org/job/incubator-netbeans-linux/lastSuccessfulBuild/artifact/nbbuild/build/rat-report.txt ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          575. juneau001 commented on issue #117: [NETBEANS-54] Modeule Review j2ee.persistence URL: https://github.com/apache/incubator-netbeans/pull/117#issuecomment-339047664 Thanks @geertjanw we ran into an issue with this package due to a ZIP file containing additional files requiring license updates. @matthiasblaesing Would you like me now to adjust the license headers for those files which I extracted? Thanks ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          576. asfgit closed pull request #169: [NETBEANS-54] Module Review o.apache.commons.httpclient URL: https://github.com/apache/incubator-netbeans/pull/169 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/o.apache.commons.httpclient/external/binaries-list b/o.apache.commons.httpclient/external/binaries-list index c97e9d5dd..b96c89ace 100644 --- a/o.apache.commons.httpclient/external/binaries-list +++ b/o.apache.commons.httpclient/external/binaries-list @@ -14,4 +14,4 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -964CD74171F427720480EFDEC40A7C7F6E58426A commons-httpclient-3.1.jar +964CD74171F427720480EFDEC40A7C7F6E58426A commons-httpclient:commons-httpclient:3.1 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          577. geertjanw commented on issue #181: [NETBEANS-54] Module Review libs.osgi (followup) URL: https://github.com/apache/incubator-netbeans/pull/181#issuecomment-339060565 Thanks for the info, will investigate. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          578. matthiasblaesing commented on issue #169: [NETBEANS-54] Module Review o.apache.commons.httpclient URL: https://github.com/apache/incubator-netbeans/pull/169#issuecomment-339061437 I pushed the commit to master. This PR is still a bit strange. For some reason you managed to push three commits into this. Two held the same change with different authors and one merged these two commits. Whatever I removed the merge and the commit with the wrong author and so this is done. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          579. vieiro commented on issue #172: [NETBEANS-54] Module Review o.apache.xml.resolver URL: https://github.com/apache/incubator-netbeans/pull/172#issuecomment-339065700 We'll either: 1- Add the complete source files to avoid patching (I'm worried about licensing issues here). 2- Build a patch utility in Java (NetBeans has some stuff for this). 1 is simpler, but 2 is more elegant. I think I'll try 2. It's worth having a pure-java patch utility that can be handy in some other situations. Regarding the 'patch" utility for Windows, maybe Google is of some help (I don't use Windows myself). ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          580. lbruun opened a new pull request #191: [NETBEANS-54] Module Review swing.validation URL: https://github.com/apache/incubator-netbeans/pull/191 Project includes `ValidationAPI.jar` (CDDL licensed), originally hosted on Kenai, now GitHub. Changed dead references to Kenai to their equivalent GitHub coordinates. Note: Even if the `ValidationAPI.jar` file is using the `org.netbeans` package namespace it is not part of the grant, as far as I can tell. Therefore it is still CDDL licensed. Should anyone want to recreate the binary from source: The binary uses Kenai SVN commit no as the version number. Since the project was transferred to GitHub with full commit history, it is possible to find the equivalent point in time in GitHub, namely end-of-day Nov 17, 2011. The URL is noted in `ValidationAPI-license.txt` file. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          581. vieiro opened a new pull request #192: [NETBEANS-54] Module Review o.apache.xml.resolver (Build fails on sys… URL: https://github.com/apache/incubator-netbeans/pull/192 Build fails on systems without the 'patch' command line tool. - The ant 'patch' task requires an external 'patch' tool that is not availble in all systems. - As a temporary solution I've added the patched sources to make the build run. - Later on, we may want to reuse some code from the 'diff' module to implement an ant patch task in pure Java. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          582. vieiro commented on issue #172: [NETBEANS-54] Module Review o.apache.xml.resolver URL: https://github.com/apache/incubator-netbeans/pull/172#issuecomment-339110849 All source is Apache 2 licensed, so no worries regarding point 1. See #192 for a fix. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          583. matthiasblaesing commented on issue #192: [NETBEANS-54] Module Review o.apache.xml.resolver (Build fails on sys… URL: https://github.com/apache/incubator-netbeans/pull/192#issuecomment-339111091 Please wait with this. I'm currently looking into a java based patching solution. This won't be pretty, but it looks to be working. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          584. matthiasblaesing commented on issue #172: [NETBEANS-54] Module Review o.apache.xml.resolver URL: https://github.com/apache/incubator-netbeans/pull/172#issuecomment-339115637 Another approach (java based patching): https://github.com/matthiasblaesing/incubator-netbeans/tree/build-java-patching ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          585. geertjanw commented on issue #191: [NETBEANS-54] Module Review swing.validation URL: https://github.com/apache/incubator-netbeans/pull/191#issuecomment-339280203 Thanks for this investigation and changes, merging. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          586. geertjanw closed pull request #191: [NETBEANS-54] Module Review swing.validation URL: https://github.com/apache/incubator-netbeans/pull/191 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/swing.validation/arch.xml b/swing.validation/arch.xml index 5268c8757..896c33ffd 100644 --- a/swing.validation/arch.xml +++ b/swing.validation/arch.xml @@ -50,7 +50,7 @@ <answer id="arch-overall"> <p> Provides a framework for adding user input validation to existing Swing - panels very simply. See <a href="http://kenai.com/projects/simplevalidation/pages/Home">the + panels very simply. See <a href="https://github.com/timboudreau/simplevalidation/">the Simple Validation</a> project for details. </p> <p> @@ -160,7 +160,7 @@ --> <answer id="arch-where"> The source code for the Simple Validation project is at - <a href="http://kenai.com/projects/simplevalidation/pages/Home">http://kenai.com/projects/simplevalidation/pages/Home</a>. + <a href="https://github.com/timboudreau/simplevalidation/">https://github.com/timboudreau/simplevalidation/</a>. The adapters for dialog descriptors and wizards are in the module. </answer> @@ -317,7 +317,7 @@ --> <answer id="dep-non-nb"> <p> - http://kenai.com/projects/simplevalidation/pages/Home + https://github.com/timboudreau/simplevalidation/ </p> </answer> diff --git a/swing.validation/external/ValidationAPI-license.txt b/swing.validation/external/ValidationAPI-license.txt index 53da6f5d7..155288e2e 100644 --- a/swing.validation/external/ValidationAPI-license.txt +++ b/swing.validation/external/ValidationAPI-license.txt @@ -3,6 +3,7 @@ Version: 331 License: CDDL-GPL-2-CP OSR: 11316 Origin: Oracle (https://svn.kenai.com/svn/simplevalidation~src/trunk@331) + (same as: https://github.com/timboudreau/simplevalidation/tree/b26b94cc001a41ab9138496b11e2ae256a159ffd) Comment: Provides utilities for adding input validation to Swing forms quickly and easily COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 diff --git a/swing.validation/nbproject/project.properties b/swing.validation/nbproject/project.properties index 4eab392ef..3c8b5465f 100644 --- a/swing.validation/nbproject/project.properties +++ b/swing.validation/nbproject/project.properties @@ -18,6 +18,6 @@ is.autoload=true javac.source=1.6 javac.compilerargs=-Xlint -Xlint:-serial javadoc.arch=${basedir}/arch.xml -nbm.homepage=http://kenai.com/projects/simplevalidation/ +nbm.homepage=https://github.com/timboudreau/simplevalidation/ nbm.module.author=Tim Boudreau release.external/ValidationAPI.jar=modules/ext/ValidationAPI.jar ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          587. geertjanw commented on issue #117: [NETBEANS-54] Modeule Review j2ee.persistence URL: https://github.com/apache/incubator-netbeans/pull/117#issuecomment-339280397 I think that makes sense, yes, i.e., please adjust license headers of those files. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          588. geertjanw commented on issue #163: [NETBEANS-54] Module Review maven.indexer URL: https://github.com/apache/incubator-netbeans/pull/163#issuecomment-339280650 Should this be merged or closed? ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          589. geertjanw commented on issue #189: [NETBEANS-54] Module Review web.browser.api URL: https://github.com/apache/incubator-netbeans/pull/189#issuecomment-339280812 Thanks. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          590. geertjanw closed pull request #189: [NETBEANS-54] Module Review web.browser.api URL: https://github.com/apache/incubator-netbeans/pull/189 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/webpreview.wsmode b/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/webpreview.wsmode index ed7b4a074..3b582d0de 100644 --- a/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/webpreview.wsmode +++ b/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/webpreview.wsmode @@ -1,5 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> - +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> <mode version="2.4"> <name unique="webpreview" /> <kind type="view" /> ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          591. geertjanw commented on issue #190: [NETBEANS-54] Module Review o.apache.commons.io URL: https://github.com/apache/incubator-netbeans/pull/190#issuecomment-339281165 Thanks. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          592. geertjanw closed pull request #190: [NETBEANS-54] Module Review o.apache.commons.io URL: https://github.com/apache/incubator-netbeans/pull/190 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/o.apache.commons.io/external/binaries-list b/o.apache.commons.io/external/binaries-list index 0858cfecb..a00542d0f 100644 --- a/o.apache.commons.io/external/binaries-list +++ b/o.apache.commons.io/external/binaries-list @@ -14,4 +14,4 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE commons-io-1.4.jar +A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE commons-io:commons-io:1.4 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          593. geertjanw commented on issue #180: [NETBEANS-54] Module Review java.hints.declarative URL: https://github.com/apache/incubator-netbeans/pull/180#issuecomment-339281482 OK, merging. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          594. geertjanw closed pull request #180: [NETBEANS-54] Module Review java.hints.declarative URL: https://github.com/apache/incubator-netbeans/pull/180 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/resources/DeclarativeHintsTestTemplate.test b/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/resources/DeclarativeHintsTestTemplate.test deleted file mode 100644 index e69de29bb..000000000 diff --git a/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/resources/HintTemplate.hint b/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/resources/HintTemplate.hint deleted file mode 100644 index 8b1378917..000000000 --- a/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/resources/HintTemplate.hint +++ /dev/null @@ -1 +0,0 @@ - diff --git a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/CallOutterMethod.test b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/CallOutterMethod.test index 14b076197..5c5379182 100644 --- a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/CallOutterMethod.test +++ b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/CallOutterMethod.test @@ -1,3 +1,21 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ %%TestCase test package test; public class Test { diff --git a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/ChangeFieldType.test b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/ChangeFieldType.test index 192eda575..d3a0cb96c 100644 --- a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/ChangeFieldType.test +++ b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/ChangeFieldType.test @@ -1,3 +1,21 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ %%TestCase no-mods package test; public class Test { diff --git a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/CustomConditionTest.test b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/CustomConditionTest.test index 3db57c1bf..99d4dea4c 100644 --- a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/CustomConditionTest.test +++ b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/CustomConditionTest.test @@ -1,3 +1,21 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ %%TestCase run-condition-pass package test; public class Test { diff --git a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/EnhancedForTest.test b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/EnhancedForTest.test index 82a0b5ce8..c52d54d6d 100644 --- a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/EnhancedForTest.test +++ b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/EnhancedForTest.test @@ -1,3 +1,21 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ %%TestCase run-condition-pass package test; public class Test { diff --git a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/FakeBlockWarning.test b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/FakeBlockWarning.test index 634a8ef18..1bc31fa88 100644 --- a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/FakeBlockWarning.test +++ b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/FakeBlockWarning.test @@ -1,3 +1,21 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ %%TestCase simple package test; import java.util.concurrent.locks.Lock; diff --git a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/ImportsTest1.test b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/ImportsTest1.test index e56e8bfdb..36c8c5ace 100644 --- a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/ImportsTest1.test +++ b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/ImportsTest1.test @@ -1,3 +1,21 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ %%TestCase simple package test; public class Test { diff --git a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/ImportsTest2.test b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/ImportsTest2.test index 818d8cbf1..18433db01 100644 --- a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/ImportsTest2.test +++ b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/ImportsTest2.test @@ -1,3 +1,21 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ %%TestCase simple package test; import java.util.LinkedList; diff --git a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/LambdaInput.test b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/LambdaInput.test index 4abe84df9..2b770e034 100644 --- a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/LambdaInput.test +++ b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/LambdaInput.test @@ -1,3 +1,21 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ %%TestCase convert-to-lambda-positive-1 package test; public abstract class Test { diff --git a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/NameBoundVariablesGetSet.test b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/NameBoundVariablesGetSet.test index ee55e5d63..bd390c9fd 100644 --- a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/NameBoundVariablesGetSet.test +++ b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/NameBoundVariablesGetSet.test @@ -1,3 +1,21 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ %%TestCase simple package test; public class Test { diff --git a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/NegativeInstanceOfTest.test b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/NegativeInstanceOfTest.test index d2127c659..e4f3c4f91 100644 --- a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/NegativeInstanceOfTest.test +++ b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/NegativeInstanceOfTest.test @@ -1,3 +1,21 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ %%TestCase positive package test; public class Test { diff --git a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/TestParentMatches.test b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/TestParentMatches.test index ae90420d2..07cc8d0db 100644 --- a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/TestParentMatches.test +++ b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/TestParentMatches.test @@ -1,3 +1,21 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ %%TestCase run-condition-pass package test; public class Test { diff --git a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/annotation-conversion.test b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/annotation-conversion.test index 285626851..62e9f156a 100644 --- a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/annotation-conversion.test +++ b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/annotation-conversion.test @@ -1,3 +1,21 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ %%TestCase test package test; import test.Test.Ann; diff --git a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/broken-condition-no-exception.test b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/broken-condition-no-exception.test index 6674c33d8..427d69fea 100644 --- a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/broken-condition-no-exception.test +++ b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/broken-condition-no-exception.test @@ -1,3 +1,21 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ %%TestCase simple package test; public class Test { diff --git a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/condition-on-fix.test b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/condition-on-fix.test index a803d8e5d..7432b2a0b 100644 --- a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/condition-on-fix.test +++ b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/condition-on-fix.test @@ -1,3 +1,21 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ %%TestCase first-fix package test; public class Test { diff --git a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/conditionapi/isAvailable.test b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/conditionapi/isAvailable.test index 9871ac957..deff177cf 100644 --- a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/conditionapi/isAvailable.test +++ b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/conditionapi/isAvailable.test @@ -1,3 +1,21 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ %%TestCase is-available-1 package test; public class Test extends ThreadLocal { diff --git a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/conditionapi/matchWithBind.test b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/conditionapi/matchWithBind.test index 334301898..8fa70e3c3 100644 --- a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/conditionapi/matchWithBind.test +++ b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/conditionapi/matchWithBind.test @@ -1,3 +1,21 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ %%TestCase bind-works-1 package test; public class Test { diff --git a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/expression-to-expression-statement.test b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/expression-to-expression-statement.test index 1ded2ab50..f3dcb5a83 100644 --- a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/expression-to-expression-statement.test +++ b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/expression-to-expression-statement.test @@ -1,3 +1,21 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ %%TestCase rewrite package test; public class Test { diff --git a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/fqn-rewrite-test.test b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/fqn-rewrite-test.test index 83b018f16..7f91c077f 100644 --- a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/fqn-rewrite-test.test +++ b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/fqn-rewrite-test.test @@ -1,3 +1,21 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ %%TestCase pos-1 package test; import javax.swing.text.AbstractDocument; diff --git a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/otherwise-test.test b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/otherwise-test.test index c6509a087..6501538e8 100644 --- a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/otherwise-test.test +++ b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/otherwise-test.test @@ -1,3 +1,21 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ %%TestCase pos-1 package test; public class Test { diff --git a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/remove-from-parent.test b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/remove-from-parent.test index e8000c650..2d3099707 100644 --- a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/remove-from-parent.test +++ b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/remove-from-parent.test @@ -1,3 +1,21 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ %%TestCase pos-1 package test; public class Test { diff --git a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/testfrombundle/display-names-from-bundle.test b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/testfrombundle/display-names-from-bundle.test index 800208c03..962d36852 100644 --- a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/testfrombundle/display-names-from-bundle.test +++ b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/testfrombundle/display-names-from-bundle.test @@ -1,3 +1,21 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ %%TestCase first-fix package test; public class Test { ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          595. matthiasblaesing commented on issue #117: [NETBEANS-54] Modeule Review j2ee.persistence URL: https://github.com/apache/incubator-netbeans/pull/117#issuecomment-339295122 Please be careful. The contents of the ZIP dies not belong to the netbeans cidebase. In the ZIP XSDs are contained, that hold the XML grammar. We should see why Rat does not detect CDDL/GPLv2CPE and EDL/EPL. From legal perspectice the file can IMHO stay. See abive für reasoning. I'm writing from my phone, I'll have a look at this tonight. Am 25. Oktober 2017 12:04:12 MESZ schrieb Geertjan Wielenga <notifications@github.com>: >I think that makes sense, yes, i.e., please adjust license headers of >those files. > >-- >You are receiving this because you were mentioned. >Reply to this email directly or view it on GitHub: >https://github.com/apache/incubator-netbeans/pull/117#issuecomment-339280397 -- Diese Nachricht wurde von meinem Android-Mobiltelefon mit K-9 Mail gesendet. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          596. geertjanw commented on issue #117: [NETBEANS-54] Modeule Review j2ee.persistence URL: https://github.com/apache/incubator-netbeans/pull/117#issuecomment-339295454 That makes sense, yes, don't relicense these from the ZIP, we need to figure out why they're caught by Rat -- and also make sure we're talking about the same files here. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          597. juneau001 commented on issue #117: [NETBEANS-54] Modeule Review j2ee.persistence URL: https://github.com/apache/incubator-netbeans/pull/117#issuecomment-339297996 I have modified the license headers for those xsd files that were contained within the archive ZIP file. Please let me know if you need anything else. Thanks ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          598. geertjanw commented on issue #117: [NETBEANS-54] Modeule Review j2ee.persistence URL: https://github.com/apache/incubator-netbeans/pull/117#issuecomment-339298136 I think we need to investigate whether this is the right approach here. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          599. juneau001 commented on issue #117: [NETBEANS-54] Modeule Review j2ee.persistence URL: https://github.com/apache/incubator-netbeans/pull/117#issuecomment-339298284 OK, I need to revert that...sorry. I read on my phone and thought you wanted me to relicense. Give me a moment to revert. Thanks ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          600. geertjanw commented on issue #117: [NETBEANS-54] Modeule Review j2ee.persistence URL: https://github.com/apache/incubator-netbeans/pull/117#issuecomment-339298472 Well, potentially it's OK. Let's wait and investigate. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          601. juneau001 commented on issue #117: [NETBEANS-54] Modeule Review j2ee.persistence URL: https://github.com/apache/incubator-netbeans/pull/117#issuecomment-339299401 I've got both versions available in my local repository...if I need to relicense then let me know and I can do it. Sorry about misreading your previous message. Too early here and just drinking my first cup of Java for the day. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          602. matthiasblaesing commented on issue #117: [NETBEANS-54] Modeule Review j2ee.persistence URL: https://github.com/apache/incubator-netbeans/pull/117#issuecomment-339460139 Ok - this still looks a bit chaotic: - please squash the commits together into one - this gives a better overview what was really changed: https://github.com/todotxt/todo.txt-android/wiki/Squash-All-Commits-Related-to-a-Single-Issue-into-a-Single-Commit - rebase the changes onto master (build.xml is currently in flux, so you need a recent version to get this mergeable) - remove these lines from `.gitignore`: ``` /j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/resources/orm_1_0.xsd /j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/resources/orm_2_0.xsd /j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/resources/orm_2_1.xsd /j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/resources/persistence_1_0.xsd /j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/resources/persistence_2_0.xsd /j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/resources/persistence_2_1.xsd ``` - the "expand zip" part in `j2ee.persistence/build.xml` needs to be removed (lines 25-29) - the contents of the zip `orm*.xsd` and `persistence*.xsd` needs to placed in `j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/resources/` (see the result of a normal build, the xsds can be found in the source) - the whole external folder needs be removed, after the XSDs are moved into the correct location - Add rat exclusions to build.xml: ``` <exclude name="j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/resources/*.xsd" /> <!-- XSDs for usage at runtime and code generation - the XSDs are not modified, so covered by https://www.apache.org/legal/resolved.html#category-b --> <exclude name="j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/ui/resources/*.xml" /> <!-- user visible file template --> <exclude name="j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/jpacontroller/resources/*.txt" /> <!-- user visible file template --> ``` This should do it. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          603. rosslamont commented on issue #163: [NETBEANS-54] Module Review maven.indexer URL: https://github.com/apache/incubator-netbeans/pull/163#issuecomment-339492014 I didn't realise I could resolve conflicts from GitHub. I've done that now, but that's made a mess after the alphabetisation. So hold up a bit and I'll sort it out. Hopefully have a clean squashed commit for you soon. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          604. rosslamont commented on issue #163: [NETBEANS-54] Module Review maven.indexer URL: https://github.com/apache/incubator-netbeans/pull/163#issuecomment-339497203 OK, all sorted, but I haven't squashed the merge masters. I'm not that familiar with git/squashing - is it safe to squash the merge commits? Just a regular squash? ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          605. junichi11 opened a new pull request #194: [NETBEANS-54] Module Review java.platform.ui URL: https://github.com/apache/incubator-netbeans/pull/194 Exclude javaplatform.xml from rat. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          606. matthiasblaesing closed pull request #192: [NETBEANS-54] Module Review o.apache.xml.resolver (Build fails on sys… URL: https://github.com/apache/incubator-netbeans/pull/192 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/o.apache.xml.resolver/build.xml b/o.apache.xml.resolver/build.xml index 40143e1fb..b19082f49 100644 --- a/o.apache.xml.resolver/build.xml +++ b/o.apache.xml.resolver/build.xml @@ -42,9 +42,16 @@ <!-- ... 2. Unzips maven sources --> <unzip src="external/xml-resolver-1.2-sources.jar" dest="build/external-patch/sources" /> <!-- ... 3. Applies patch 'external/xml-resolver-1.2-netbeans.patch --> + <!-- DISABLED: + - ant patch task requires external 'patch' tool, not available on all systems. + - We may want to reuse some code from the 'diff' module to implement an patch task later on. <patch dir="build/external-patch/sources" patchfile="external/xml-resolver-1.2-netbeans.patch" strip="0" /> + --> + <copy todir="build/externa-patch/sources"> + <fileset dir="patch-src" /> + </copy> <!-- ... 4. Compiles sources to build/external-patch/classes --> <mkdir dir="build/external-patch/classes" /> <javac srcdir="build/external-patch/sources" diff --git a/o.apache.xml.resolver/patch-src/org/apache/xml/resolver/Catalog.java b/o.apache.xml.resolver/patch-src/org/apache/xml/resolver/Catalog.java new file mode 100644 index 000000000..cc129792d --- /dev/null +++ b/o.apache.xml.resolver/patch-src/org/apache/xml/resolver/Catalog.java @@ -0,0 +1,2231 @@ +// Catalog.java - Represents OASIS Open Catalog files. + +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.apache.xml.resolver; + +import java.io.IOException; +import java.io.FileNotFoundException; +import java.io.InputStream; +import java.io.UnsupportedEncodingException; +import java.io.DataInputStream; + +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; + +import java.net.URL; +import java.net.MalformedURLException; + +import javax.xml.parsers.SAXParserFactory; + +import org.apache.xml.resolver.CatalogManager; +import org.apache.xml.resolver.helpers.PublicId; +import org.apache.xml.resolver.readers.CatalogReader; +import org.apache.xml.resolver.readers.SAXCatalogReader; +import org.apache.xml.resolver.readers.TR9401CatalogReader; +import org.apache.xml.resolver.readers.OASISXMLCatalogReader; +import org.apache.xml.resolver.helpers.FileURL; + +/** + * Represents OASIS Open Catalog files. + * + * <p>This class implements the semantics of OASIS Open Catalog files + * (defined by + * <a href="http://www.oasis-open.org/html/a401.htm">OASIS Technical + * Resolution 9401:1997 (Amendment 2 to TR 9401)</a>).</p> + * + * <p>The primary purpose of the Catalog is to associate resources in the + * document with local system identifiers. Some entities + * (document types, XML entities, and notations) have names and all of them + * can have either public or system identifiers or both. (In XML, only a + * notation can have a public identifier without a system identifier, but + * the methods implemented in this class obey the Catalog semantics + * from the SGML + * days when system identifiers were optional.)</p> + * + * <p>The system identifiers returned by the resolution methods in this + * class are valid, i.e. usable by, and in fact constructed by, the + * <tt>java.net.URL</tt> class. Unfortunately, this class seems to behave in + * somewhat non-standard ways and the system identifiers returned may + * not be directly usable in a browser or filesystem context. + * + * <p>This class recognizes all of the Catalog entries defined in + * TR9401:1997:</p> + * + * <ul> + * <li><b>BASE</b> + * changes the base URI for resolving relative system identifiers. The + * initial base URI is the URI of the location of the catalog (which is, + * in turn, relative to the location of the current working directory + * at startup, as returned by the <tt>user.dir</tt> system property).</li> + * <li><b>CATALOG</b> + * processes other catalog files. An included catalog occurs logically + * at the end of the including catalog.</li> + * <li><b>DELEGATE_PUBLIC</b> + * specifies alternate catalogs for some public identifiers. The delegated + * catalogs are not loaded until they are needed, but they are cached + * once loaded.</li> + * <li><b>DELEGATE_SYSTEM</b> + * specifies alternate catalogs for some system identifiers. The delegated + * catalogs are not loaded until they are needed, but they are cached + * once loaded.</li> + * <li><b>DELEGATE_URI</b> + * specifies alternate catalogs for some URIs. The delegated + * catalogs are not loaded until they are needed, but they are cached + * once loaded.</li> + * <li><b>REWRITE_SYSTEM</b> + * specifies alternate prefix for a system identifier.</li> + * <li><b>REWRITE_URI</b> + * specifies alternate prefix for a URI.</li> + * <li><b>SYSTEM_SUFFIX</b> + * maps any system identifier that ends with a particular suffix to another + * system identifier.</li> + * <li><b>URI_SUFFIX</b> + * maps any URI that ends with a particular suffix to another URI.</li> + * <li><b>DOCTYPE</b> + * associates the names of root elements with URIs. (In other words, an XML + * processor might infer the doctype of an XML document that does not include + * a doctype declaration by looking for the DOCTYPE entry in the + * catalog which matches the name of the root element of the document.)</li> + * <li><b>DOCUMENT</b> + * provides a default document.</li> + * <li><b>DTDDECL</b> + * recognized and silently ignored. Not relevant for XML.</li> + * <li><b>ENTITY</b> + * associates entity names with URIs.</li> + * <li><b>LINKTYPE</b> + * recognized and silently ignored. Not relevant for XML.</li> + * <li><b>NOTATION</b> + * associates notation names with URIs.</li> + * <li><b>OVERRIDE</b> + * changes the override behavior. Initial behavior is set by the + * system property <tt>xml.catalog.override</tt>. The default initial + * behavior is 'YES', that is, entries in the catalog override + * system identifiers specified in the document.</li> + * <li><b>PUBLIC</b> + * maps a public identifier to a system identifier.</li> + * <li><b>SGMLDECL</b> + * recognized and silently ignored. Not relevant for XML.</li> + * <li><b>SYSTEM</b> + * maps a system identifier to another system identifier.</li> + * <li><b>URI</b> + * maps a URI to another URI.</li> + * </ul> + * + * <p>Note that BASE entries are treated as described by RFC2396. In + * particular, this has the counter-intuitive property that after a BASE + * entry identifing "http://example.com/a/b/c" as the base URI, + * the relative URI "foo" is resolved to the absolute URI + * "http://example.com/a/b/foo". You must provide the trailing slash if + * you do not want the final component of the path to be discarded as a + * filename would in a URI for a resource: "http://example.com/a/b/c/". + * </p> + * + * <p>Note that subordinate catalogs (all catalogs except the first, + * including CATALOG and DELEGATE* catalogs) are only loaded if and when + * they are required.</p> + * + * <p>This class relies on classes which implement the CatalogReader + * interface to actually load catalog files. This allows the catalog + * semantics to be implemented for TR9401 text-based catalogs, XML + * catalogs, or any number of other storage formats.</p> + * + * <p>Additional catalogs may also be loaded with the + * {@link #parseCatalog} method.</p> + * </dd> + * </dl> + * + * <p><b>Change Log:</b></p> + * <dl> + * <dt>2.0</dt> + * <dd><p>Rewrite to use CatalogReaders.</p></dd> + * <dt>1.1</dt> + * <dd><p>Allow quoted components in <tt>xml.catalog.files</tt> + * so that URLs containing colons can be used on Unix. + * The string passed to <tt>xml.catalog.files</tt> can now have the form:</p> + * <pre> + * unquoted-path-with-no-sep-chars:"double-quoted path with or without sep chars":'single-quoted path with or without sep chars' + * </pre> + * <p>(Where ":" is the separater character in this example.)</p> + * <p>If an unquoted path contains an embedded double or single quote + * character, no special processig is performed on that character. No + * path can contain separater characters, double, and single quotes + * simultaneously.</p> + * <p>Fix bug in calculation of BASE entries: if + * a catalog contains multiple BASE entries, each is relative to the preceding + * base, not the default base URI of the catalog.</p> + * </dd> + * <dt>1.0.1</dt> + * <dd><p>Fixed a bug in the calculation of the list of subordinate catalogs. + * This bug caused an infinite loop where parsing would alternately process + * two catalogs indefinitely.</p> + * </dd> + * </dl> + * + * @see CatalogReader + * @see CatalogEntry + * + * @author Norman Walsh + * <a href="mailto:Norman.Walsh@Sun.COM">Norman.Walsh@Sun.COM</a> + * + * @version 1.0 + * + * <p>Derived from public domain code originally published by Arbortext, + * Inc.</p> + */ +public class Catalog { + /** The BASE Catalog Entry type. */ + public static final int BASE = CatalogEntry.addEntryType("BASE", 1); + + /** The CATALOG Catalog Entry type. */ + public static final int CATALOG = CatalogEntry.addEntryType("CATALOG", 1); + + /** The DOCUMENT Catalog Entry type. */ + public static final int DOCUMENT = CatalogEntry.addEntryType("DOCUMENT", 1); + + /** The OVERRIDE Catalog Entry type. */ + public static final int OVERRIDE = CatalogEntry.addEntryType("OVERRIDE", 1); + + /** The SGMLDECL Catalog Entry type. */ + public static final int SGMLDECL = CatalogEntry.addEntryType("SGMLDECL", 1); + + /** The DELEGATE_PUBLIC Catalog Entry type. */ + public static final int DELEGATE_PUBLIC = CatalogEntry.addEntryType("DELEGATE_PUBLIC", 2); + + /** The DELEGATE_SYSTEM Catalog Entry type. */ + public static final int DELEGATE_SYSTEM = CatalogEntry.addEntryType("DELEGATE_SYSTEM", 2); + + /** The DELEGATE_URI Catalog Entry type. */ + public static final int DELEGATE_URI = CatalogEntry.addEntryType("DELEGATE_URI", 2); + + /** The DOCTYPE Catalog Entry type. */ + public static final int DOCTYPE = CatalogEntry.addEntryType("DOCTYPE", 2); + + /** The DTDDECL Catalog Entry type. */ + public static final int DTDDECL = CatalogEntry.addEntryType("DTDDECL", 2); + + /** The ENTITY Catalog Entry type. */ + public static final int ENTITY = CatalogEntry.addEntryType("ENTITY", 2); + + /** The LINKTYPE Catalog Entry type. */ + public static final int LINKTYPE = CatalogEntry.addEntryType("LINKTYPE", 2); + + /** The NOTATION Catalog Entry type. */ + public static final int NOTATION = CatalogEntry.addEntryType("NOTATION", 2); + + /** The PUBLIC Catalog Entry type. */ + public static final int PUBLIC = CatalogEntry.addEntryType("PUBLIC", 2); + + /** The SYSTEM Catalog Entry type. */ + public static final int SYSTEM = CatalogEntry.addEntryType("SYSTEM", 2); + + /** The URI Catalog Entry type. */ + public static final int URI = CatalogEntry.addEntryType("URI", 2); + + /** The REWRITE_SYSTEM Catalog Entry type. */ + public static final int REWRITE_SYSTEM = CatalogEntry.addEntryType("REWRITE_SYSTEM", 2); + + /** The REWRITE_URI Catalog Entry type. */ + public static final int REWRITE_URI = CatalogEntry.addEntryType("REWRITE_URI", 2); + /** The SYSTEM_SUFFIX Catalog Entry type. */ + public static final int SYSTEM_SUFFIX = CatalogEntry.addEntryType("SYSTEM_SUFFIX", 2); + /** The URI_SUFFIX Catalog Entry type. */ + public static final int URI_SUFFIX = CatalogEntry.addEntryType("URI_SUFFIX", 2); + + /** + * The base URI for relative system identifiers in the catalog. + * This may be changed by BASE entries in the catalog. + */ + protected URL base; + + /** The base URI of the Catalog file currently being parsed. */ + protected URL catalogCwd; + + /** The catalog entries currently known to the system. */ + protected Vector catalogEntries = new Vector(); + + /** The default initial override setting. */ + protected boolean default_override = true; + + /** The catalog manager in use for this instance. */ + protected CatalogManager catalogManager = CatalogManager.getStaticManager(); + + /** + * A vector of catalog files to be loaded. + * + * <p>This list is initially established by + * <code>loadSystemCatalogs</code> when + * it parses the system catalog list, but CATALOG entries may + * contribute to it during the course of parsing.</p> + * + * @see #loadSystemCatalogs + * @see #localCatalogFiles + */ + protected Vector catalogFiles = new Vector(); + + /** + * A vector of catalog files constructed during processing of + * CATALOG entries in the current catalog. + * + * <p>This two-level system is actually necessary to correctly implement + * the semantics of the CATALOG entry. If one catalog file includes + * another with a CATALOG entry, the included catalog logically + * occurs <i>at the end</i> of the including catalog, and after any + * preceding CATALOG entries. In other words, the CATALOG entry + * cannot insert anything into the middle of a catalog file.</p> + * + * <p>When processing reaches the end of each catalog files, any + * elements on this vector are added to the front of the + * <code>catalogFiles</code> vector.</p> + * + * @see #catalogFiles + */ + protected Vector localCatalogFiles = new Vector(); + + /** + * A vector of Catalogs. + * + * <p>The semantics of Catalog resolution are such that each + * catalog is effectively a list of Catalogs (in other words, + * a recursive list of Catalog instances).</p> + * + * <p>Catalogs that are processed as the result of CATALOG or + * DELEGATE* entries are subordinate to the catalog that contained + * them, but they may in turn have subordinate catalogs.</p> + * + * <p>Catalogs are only loaded when they are needed, so this vector + * initially contains a list of Catalog filenames (URLs). If, during + * processing, one of these catalogs has to be loaded, the resulting + * Catalog object is placed in the vector, effectively caching it + * for the next query.</p> + */ + protected Vector catalogs = new Vector(); + + /** + * A vector of DELEGATE* Catalog entries constructed during + * processing of the Catalog. + * + * <p>This two-level system has two purposes; first, it allows + * us to sort the DELEGATE* entries by the length of the partial + * public identifier so that a linear search encounters them in + * the correct order and second, it puts them all at the end of + * the Catalog.</p> + * + * <p>When processing reaches the end of each catalog file, any + * elements on this vector are added to the end of the + * <code>catalogEntries</code> vector. This assures that matching + * PUBLIC keywords are encountered before DELEGATE* entries.</p> + */ + protected Vector localDelegate = new Vector(); + + /** + * A hash of CatalogReaders. + * + * <p>This hash maps MIME types to elements in the readerArr + * vector. This allows the Catalog to quickly locate the reader + * for a particular MIME type.</p> + */ + protected Hashtable readerMap = new Hashtable(); + + /** + * A vector of CatalogReaders. + * + * <p>This vector contains all of the readers in the order that they + * were added. In the event that a catalog is read from a file, where + * the MIME type is unknown, each reader is attempted in turn until + * one succeeds.</p> + */ + protected Vector readerArr = new Vector(); + + /** + * Constructs an empty Catalog. + * + * <p>The constructor interrogates the relevant system properties + * using the default (static) CatalogManager + * and initializes the catalog data structures.</p> + */ + public Catalog() { + // nop; + } + + /** + * Constructs an empty Catalog with a specific CatalogManager. + * + * <p>The constructor interrogates the relevant system properties + * using the specified Catalog Manager + * and initializes the catalog data structures.</p> + */ + public Catalog(CatalogManager manager) { + catalogManager = manager; + } + + /** + * Return the CatalogManager used by this catalog. + * + */ + public CatalogManager getCatalogManager() { + return catalogManager; + } + + /** + * Establish the CatalogManager used by this catalog. + * + */ + public void setCatalogManager(CatalogManager manager) { + catalogManager = manager; + } + + /** + * Return all registered public IDs. + * This method added for solving the following issues in NetBeans codebase: + * http://www.netbeans.org/issues/show_bug.cgi?id=98212 + * and + * http://www.netbeans.org/issues/show_bug.cgi?id=112679 + */ + public java.util.Iterator getPublicIDs() { + Vector v = new Vector(); + Enumeration enumeration = catalogEntries.elements(); + + while (enumeration.hasMoreElements()) { + CatalogEntry e = (CatalogEntry) enumeration.nextElement(); + if (e.getEntryType() == PUBLIC) { + v.add(e.getEntryArg(0)); + } + } + return v.iterator(); + } + + /** + * Setup readers. + */ + public void setupReaders() { + SAXParserFactory spf = SAXParserFactory.newInstance(); + spf.setNamespaceAware(true); + spf.setValidating(false); + + SAXCatalogReader saxReader = new SAXCatalogReader(spf); + + saxReader.setCatalogParser(null, "XCatalog", + "org.apache.xml.resolver.readers.XCatalogReader"); + + saxReader.setCatalogParser(OASISXMLCatalogReader.namespaceName, + "catalog", + "org.apache.xml.resolver.readers.OASISXMLCatalogReader"); + + addReader("application/xml", saxReader); + + TR9401CatalogReader textReader = new TR9401CatalogReader(); + addReader("text/plain", textReader); + } + + /** + * Add a new CatalogReader to the Catalog. + * + * <p>This method allows you to add a new CatalogReader to the + * catalog. The reader will be associated with the specified mimeType. + * You can only have one reader per mimeType.</p> + * + * <p>In the absence of a mimeType (e.g., when reading a catalog + * directly from a file on the local system), the readers are attempted + * in the order that you add them to the Catalog.</p> + * + * <p>Note that subordinate catalogs (created by CATALOG or + * DELEGATE* entries) get a copy of the set of readers present in + * the primary catalog when they are created. Readers added subsequently + * will not be available. For this reason, it is best to add all + * of the readers before the first call to parse a catalog.</p> + * + * @param mimeType The MIME type associated with this reader. + * @param reader The CatalogReader to use. + */ + public void addReader(String mimeType, CatalogReader reader) { + if (readerMap.containsKey(mimeType)) { + Integer pos = (Integer) readerMap.get(mimeType); + readerArr.set(pos.intValue(), reader); + } else { + readerArr.add(reader); + Integer pos = new Integer(readerArr.size()-1); + readerMap.put(mimeType, pos); + } + } + + /** + * Copies the reader list from the current Catalog to a new Catalog. + * + * <p>This method is used internally when constructing a new catalog. + * It copies the current reader associations over to the new catalog. + * </p> + * + * @param newCatalog The new Catalog. + */ + protected void copyReaders(Catalog newCatalog) { + // Have to copy the readers in the right order...convert hash to arr + Vector mapArr = new Vector(readerMap.size()); + + // Pad the mapArr out to the right length + for (int count = 0; count < readerMap.size(); count++) { + mapArr.add(null); + } + + Enumeration en = readerMap.keys(); + while (en.hasMoreElements()) { + String mimeType = (String) en.nextElement(); + Integer pos = (Integer) readerMap.get(mimeType); + mapArr.set(pos.intValue(), mimeType); + } + + for (int count = 0; count < mapArr.size(); count++) { + String mimeType = (String) mapArr.get(count); + Integer pos = (Integer) readerMap.get(mimeType); + newCatalog.addReader(mimeType, + (CatalogReader) + readerArr.get(pos.intValue())); + } + } + + /** + * Create a new Catalog object. + * + * <p>This method constructs a new instance of the running Catalog + * class (which might be a subtype of org.apache.xml.resolver.Catalog). + * All new catalogs are managed by the same CatalogManager. + * </p> + * + * <p>N.B. All Catalog subtypes should call newCatalog() to construct + * a new Catalog. Do not simply use "new Subclass()" since that will + * confuse future subclasses.</p> + */ + protected Catalog newCatalog() { + String catalogClass = this.getClass().getName(); + + try { + Catalog c = (Catalog) (Class.forName(catalogClass).newInstance()); + c.setCatalogManager(catalogManager); + copyReaders(c); + return c; + } catch (ClassNotFoundException cnfe) { + catalogManager.debug.message(1, "Class Not Found Exception: " + catalogClass); + } catch (IllegalAccessException iae) { + catalogManager.debug.message(1, "Illegal Access Exception: " + catalogClass); + } catch (InstantiationException ie) { + catalogManager.debug.message(1, "Instantiation Exception: " + catalogClass); + } catch (ClassCastException cce) { + catalogManager.debug.message(1, "Class Cast Exception: " + catalogClass); + } catch (Exception e) { + catalogManager.debug.message(1, "Other Exception: " + catalogClass); + } + + Catalog c = new Catalog(); + c.setCatalogManager(catalogManager); + copyReaders(c); + return c; + } + + /** + * Returns the current base URI. + */ + public String getCurrentBase() { + return base.toString(); + } + + /** + * Returns the default override setting associated with this + * catalog. + * + * <p>All catalog files loaded by this catalog will have the + * initial override setting specified by this default.</p> + */ + public String getDefaultOverride() { + if (default_override) { + return "yes"; + } else { + return "no"; + } + } + + /** + * Load the system catalog files. + * + * <p>The method adds all of the + * catalogs specified in the <tt>xml.catalog.files</tt> property + * to the Catalog list.</p> + * + * @throws MalformedURLException One of the system catalogs is + * identified with a filename that is not a valid URL. + * @throws IOException One of the system catalogs cannot be read. + */ + public void loadSystemCatalogs() + throws MalformedURLException, IOException { + + Vector catalogs = catalogManager.getCatalogFiles(); + if (catalogs != null) { + for (int count = 0; count < catalogs.size(); count++) { + catalogFiles.addElement(catalogs.elementAt(count)); + } + } + + if (catalogFiles.size() > 0) { + // This is a little odd. The parseCatalog() method expects + // a filename, but it adds that name to the end of the + // catalogFiles vector, and then processes that vector. + // This allows the system to handle CATALOG entries + // correctly. + // + // In this init case, we take the last element off the + // catalogFiles vector and pass it to parseCatalog. This + // will "do the right thing" in the init case, and allow + // parseCatalog() to do the right thing in the non-init + // case. Honest. + // + String catfile = (String) catalogFiles.lastElement(); + catalogFiles.removeElement(catfile); + parseCatalog(catfile); + } + } + + /** + * Parse a catalog file, augmenting internal data structures. + * + * @param fileName The filename of the catalog file to process + * + * @throws MalformedURLException The fileName cannot be turned into + * a valid URL. + * @throws IOException Error reading catalog file. + */ + public synchronized void parseCatalog(String fileName) + throws MalformedURLException, IOException { + + default_override = catalogManager.getPreferPublic(); + catalogManager.debug.message(4, "Parse catalog: " + fileName); + + // Put the file into the list of catalogs to process... + // In all cases except the case when initCatalog() is the + // caller, this will be the only catalog initially in the list... + catalogFiles.addElement(fileName); + + // Now process all the pending catalogs... + parsePendingCatalogs(); + } + + /** + * Parse a catalog file, augmenting internal data structures. + * + * <p>Catalogs retrieved over the net may have an associated MIME type. + * The MIME type can be used to select an appropriate reader.</p> + * + * @param mimeType The MIME type of the catalog file. + * @param is The InputStream from which the catalog should be read + * + * @throws CatalogException Failed to load catalog + * mimeType. + * @throws IOException Error reading catalog file. + */ + public synchronized void parseCatalog(String mimeType, InputStream is) + throws IOException, CatalogException { + + default_override = catalogManager.getPreferPublic(); + catalogManager.debug.message(4, "Parse " + mimeType + " catalog on input stream"); + + CatalogReader reader = null; + + if (readerMap.containsKey(mimeType)) { + int arrayPos = ((Integer) readerMap.get(mimeType)).intValue(); + reader = (CatalogReader) readerArr.get(arrayPos); + } + + if (reader == null) { + String msg = "No CatalogReader for MIME type: " + mimeType; + catalogManager.debug.message(2, msg); + throw new CatalogException(CatalogException.UNPARSEABLE, msg); + } + + reader.readCatalog(this, is); + + // Now process all the pending catalogs... + parsePendingCatalogs(); + } + + /** + * Parse a catalog document, augmenting internal data structures. + * + * <p>This method supports catalog files stored in jar files: e.g., + * jar:file:///path/to/filename.jar!/path/to/catalog.xml". That URI + * doesn't survive transmogrification through the URI processing that + * the parseCatalog(String) performs and passing it as an input stream + * doesn't set the base URI appropriately.</p> + * + * <p>Written by Stefan Wachter (2002-09-26)</p> + * + * @param aUrl The URL of the catalog document to process + * + * @throws IOException Error reading catalog file. + */ + public synchronized void parseCatalog(URL aUrl) throws IOException { + catalogCwd = aUrl; + base = aUrl; + + default_override = catalogManager.getPreferPublic(); + catalogManager.debug.message(4, "Parse catalog: " + aUrl.toString()); + + DataInputStream inStream = null; + boolean parsed = false; + + for (int count = 0; !parsed && count < readerArr.size(); count++) { + CatalogReader reader = (CatalogReader) readerArr.get(count); + + try { + inStream = new DataInputStream(aUrl.openStream()); + } catch (FileNotFoundException fnfe) { + // No catalog; give up! + break; + } + + try { + reader.readCatalog(this, inStream); + parsed=true; + } catch (CatalogException ce) { + if (ce.getExceptionType() == CatalogException.PARSE_FAILED) { + // give up! + break; + } else { + // try again! + } + } + + try { + inStream.close(); + } catch (IOException e) { + //nop + } + } + + if (parsed) parsePendingCatalogs(); + } + + /** + * Parse all of the pending catalogs. + * + * <p>Catalogs may refer to other catalogs, this method parses + * all of the currently pending catalog files.</p> + */ + protected synchronized void parsePendingCatalogs() + throws MalformedURLException, IOException { + + if (!localCatalogFiles.isEmpty()) { + // Move all the localCatalogFiles into the front of + // the catalogFiles queue + Vector newQueue = new Vector(); + Enumeration q = localCatalogFiles.elements(); + while (q.hasMoreElements()) { + newQueue.addElement(q.nextElement()); + } + + // Put the rest of the catalogs on the end of the new list + for (int curCat = 0; curCat < catalogFiles.size(); curCat++) { + String catfile = (String) catalogFiles.elementAt(curCat); + newQueue.addElement(catfile); + } + + catalogFiles = newQueue; + localCatalogFiles.clear(); + } + + // Suppose there are no catalog files to process, but the + // single catalog already parsed included some delegate + // entries? Make sure they don't get lost. + if (catalogFiles.isEmpty() && !localDelegate.isEmpty()) { + Enumeration e = localDelegate.elements(); + while (e.hasMoreElements()) { + catalogEntries.addElement(e.nextElement()); + } + localDelegate.clear(); + } + + // Now process all the files on the catalogFiles vector. This + // vector can grow during processing if CATALOG entries are + // encountered in the catalog + while (!catalogFiles.isEmpty()) { + String catfile = (String) catalogFiles.elementAt(0); + try { + catalogFiles.remove(0); + } catch (ArrayIndexOutOfBoundsException e) { + // can't happen + } + + if (catalogEntries.size() == 0 && catalogs.size() == 0) { + // We haven't parsed any catalogs yet, let this + // catalog be the first... + try { + parseCatalogFile(catfile); + } catch (CatalogException ce) { + System.out.println("FIXME: " + ce.toString()); + } + } else { + // This is a subordinate catalog. We save its name, + // but don't bother to load it unless it's necessary. + catalogs.addElement(catfile); + } + + if (!localCatalogFiles.isEmpty()) { + // Move all the localCatalogFiles into the front of + // the catalogFiles queue + Vector newQueue = new Vector(); + Enumeration q = localCatalogFiles.elements(); + while (q.hasMoreElements()) { + newQueue.addElement(q.nextElement()); + } + + // Put the rest of the catalogs on the end of the new list + for (int curCat = 0; curCat < catalogFiles.size(); curCat++) { + catfile = (String) catalogFiles.elementAt(curCat); + newQueue.addElement(catfile); + } + + catalogFiles = newQueue; + localCatalogFiles.clear(); + } + + if (!localDelegate.isEmpty()) { + Enumeration e = localDelegate.elements(); + while (e.hasMoreElements()) { + catalogEntries.addElement(e.nextElement()); + } + localDelegate.clear(); + } + } + + // We've parsed them all, reinit the vector... + catalogFiles.clear(); + } + + /** + * Parse a single catalog file, augmenting internal data structures. + * + * @param fileName The filename of the catalog file to process + * + * @throws MalformedURLException The fileName cannot be turned into + * a valid URL. + * @throws IOException Error reading catalog file. + */ + protected synchronized void parseCatalogFile(String fileName) + throws MalformedURLException, IOException, CatalogException { + + CatalogEntry entry; + + // The base-base is the cwd. If the catalog file is specified + // with a relative path, this assures that it gets resolved + // properly... + try { + // tack on a basename because URLs point to files not dirs + catalogCwd = FileURL.makeURL("basename"); + } catch (MalformedURLException e) { + String userdir = System.getProperty("user.dir"); + userdir = userdir.replace('\\', '/'); + catalogManager.debug.message(1, "Malformed URL on cwd", userdir); + catalogCwd = null; + } + + // The initial base URI is the location of the catalog file + try { + base = new URL(catalogCwd, fixSlashes(fileName)); + } catch (MalformedURLException e) { + try { + base = new URL("file:" + fixSlashes(fileName)); + } catch (MalformedURLException e2) { + catalogManager.debug.message(1, "Malformed URL on catalog filename", + fixSlashes(fileName)); + base = null; + } + } + + catalogManager.debug.message(2, "Loading catalog", fileName); + catalogManager.debug.message(4, "Default BASE", base.toString()); + + fileName = base.toString(); + + DataInputStream inStream = null; + boolean parsed = false; + boolean notFound = false; + + for (int count = 0; !parsed && count < readerArr.size(); count++) { + CatalogReader reader = (CatalogReader) readerArr.get(count); + + try { + notFound = false; + inStream = new DataInputStream(base.openStream()); + } catch (FileNotFoundException fnfe) { + // No catalog; give up! + notFound = true; + break; + } + + try { + reader.readCatalog(this, inStream); + parsed = true; + } catch (CatalogException ce) { + if (ce.getExceptionType() == CatalogException.PARSE_FAILED) { + // give up! + break; + } else { + // try again! + } + } + + try { + inStream.close(); + } catch (IOException e) { + //nop + } + } + + if (!parsed) { + if (notFound) { + catalogManager.debug.message(3, "Catalog does not exist", fileName); + } else { + catalogManager.debug.message(1, "Failed to parse catalog", fileName); + } + } + } + + /** + * Cleanup and process a Catalog entry. + * + * <p>This method processes each Catalog entry, changing mapped + * relative system identifiers into absolute ones (based on the current + * base URI), and maintaining other information about the current + * catalog.</p> + * + * @param entry The CatalogEntry to process. + */ + public void addEntry(CatalogEntry entry) { + int type = entry.getEntryType(); + + if (type == BASE) { + String value = entry.getEntryArg(0); + URL newbase = null; + + if (base == null) { + catalogManager.debug.message(5, "BASE CUR", "null"); + } else { + catalogManager.debug.message(5, "BASE CUR", base.toString()); + } + catalogManager.debug.message(4, "BASE STR", value); + + try { + value = fixSlashes(value); + newbase = new URL(base, value); + } catch (MalformedURLException e) { + try { + newbase = new URL("file:" + value); + } catch (MalformedURLException e2) { + catalogManager.debug.message(1, "Malformed URL on base", value); + newbase = null; + } + } + + if (newbase != null) { + base = newbase; + } + + catalogManager.debug.message(5, "BASE NEW", base.toString()); + } else if (type == CATALOG) { + String fsi = makeAbsolute(entry.getEntryArg(0)); + + catalogManager.debug.message(4, "CATALOG", fsi); + + localCatalogFiles.addElement(fsi); + } else if (type == PUBLIC) { + String publicid = PublicId.normalize(entry.getEntryArg(0)); + String systemid = makeAbsolute(normalizeURI(entry.getEntryArg(1))); + + entry.setEntryArg(0, publicid); + entry.setEntryArg(1, systemid); + + catalogManager.debug.message(4, "PUBLIC", publicid, systemid); + + catalogEntries.addElement(entry); + } else if (type == SYSTEM) { + String systemid = normalizeURI(entry.getEntryArg(0)); + String fsi = makeAbsolute(normalizeURI(entry.getEntryArg(1))); + + entry.setEntryArg(1, fsi); + + catalogManager.debug.message(4, "SYSTEM", systemid, fsi); + + catalogEntries.addElement(entry); + } else if (type == URI) { + String uri = normalizeURI(entry.getEntryArg(0)); + String altURI = makeAbsolute(normalizeURI(entry.getEntryArg(1))); + + entry.setEntryArg(1, altURI); + + catalogManager.debug.message(4, "URI", uri, altURI); + + catalogEntries.addElement(entry); + } else if (type == DOCUMENT) { + String fsi = makeAbsolute(normalizeURI(entry.getEntryArg(0))); + entry.setEntryArg(0, fsi); + + catalogManager.debug.message(4, "DOCUMENT", fsi); + + catalogEntries.addElement(entry); + } else if (type == OVERRIDE) { + catalogManager.debug.message(4, "OVERRIDE", entry.getEntryArg(0)); + + catalogEntries.addElement(entry); + } else if (type == SGMLDECL) { + // meaningless in XML + String fsi = makeAbsolute(normalizeURI(entry.getEntryArg(0))); + entry.setEntryArg(0, fsi); + + catalogManager.debug.message(4, "SGMLDECL", fsi); + + catalogEntries.addElement(entry); + } else if (type == DELEGATE_PUBLIC) { + String ppi = PublicId.normalize(entry.getEntryArg(0)); + String fsi = makeAbsolute(normalizeURI(entry.getEntryArg(1))); + + entry.setEntryArg(0, ppi); + entry.setEntryArg(1, fsi); + + catalogManager.debug.message(4, "DELEGATE_PUBLIC", ppi, fsi); + + addDelegate(entry); + } else if (type == DELEGATE_SYSTEM) { + String psi = normalizeURI(entry.getEntryArg(0)); + String fsi = makeAbsolute(normalizeURI(entry.getEntryArg(1))); + + entry.setEntryArg(0, psi); + entry.setEntryArg(1, fsi); + + catalogManager.debug.message(4, "DELEGATE_SYSTEM", psi, fsi); + + addDelegate(entry); + } else if (type == DELEGATE_URI) { + String pui = normalizeURI(entry.getEntryArg(0)); + String fsi = makeAbsolute(normalizeURI(entry.getEntryArg(1))); + + entry.setEntryArg(0, pui); + entry.setEntryArg(1, fsi); + + catalogManager.debug.message(4, "DELEGATE_URI", pui, fsi); + + addDelegate(entry); + } else if (type == REWRITE_SYSTEM) { + String psi = normalizeURI(entry.getEntryArg(0)); + String rpx = makeAbsolute(normalizeURI(entry.getEntryArg(1))); + + entry.setEntryArg(0, psi); + entry.setEntryArg(1, rpx); + + catalogManager.debug.message(4, "REWRITE_SYSTEM", psi, rpx); + + catalogEntries.addElement(entry); + } else if (type == REWRITE_URI) { + String pui = normalizeURI(entry.getEntryArg(0)); + String upx = makeAbsolute(normalizeURI(entry.getEntryArg(1))); + + entry.setEntryArg(0, pui); + entry.setEntryArg(1, upx); + + catalogManager.debug.message(4, "REWRITE_URI", pui, upx); + + catalogEntries.addElement(entry); + } else if (type == SYSTEM_SUFFIX) { + String pui = normalizeURI(entry.getEntryArg(0)); + String upx = makeAbsolute(normalizeURI(entry.getEntryArg(1))); + + entry.setEntryArg(0, pui); + entry.setEntryArg(1, upx); + + catalogManager.debug.message(4, "SYSTEM_SUFFIX", pui, upx); + + catalogEntries.addElement(entry); + } else if (type == URI_SUFFIX) { + String pui = normalizeURI(entry.getEntryArg(0)); + String upx = makeAbsolute(normalizeURI(entry.getEntryArg(1))); + + entry.setEntryArg(0, pui); + entry.setEntryArg(1, upx); + + catalogManager.debug.message(4, "URI_SUFFIX", pui, upx); + + catalogEntries.addElement(entry); + } else if (type == DOCTYPE) { + String fsi = makeAbsolute(normalizeURI(entry.getEntryArg(1))); + entry.setEntryArg(1, fsi); + + catalogManager.debug.message(4, "DOCTYPE", entry.getEntryArg(0), fsi); + + catalogEntries.addElement(entry); + } else if (type == DTDDECL) { + // meaningless in XML + String fpi = PublicId.normalize(entry.getEntryArg(0)); + entry.setEntryArg(0, fpi); + String fsi = makeAbsolute(normalizeURI(entry.getEntryArg(1))); + entry.setEntryArg(1, fsi); + + catalogManager.debug.message(4, "DTDDECL", fpi, fsi); + + catalogEntries.addElement(entry); + } else if (type == ENTITY) { + String fsi = makeAbsolute(normalizeURI(entry.getEntryArg(1))); + entry.setEntryArg(1, fsi); + + catalogManager.debug.message(4, "ENTITY", entry.getEntryArg(0), fsi); + + catalogEntries.addElement(entry); + } else if (type == LINKTYPE) { + // meaningless in XML + String fsi = makeAbsolute(normalizeURI(entry.getEntryArg(1))); + entry.setEntryArg(1, fsi); + + catalogManager.debug.message(4, "LINKTYPE", entry.getEntryArg(0), fsi); + + catalogEntries.addElement(entry); + } else if (type == NOTATION) { + String fsi = makeAbsolute(normalizeURI(entry.getEntryArg(1))); + entry.setEntryArg(1, fsi); + + catalogManager.debug.message(4, "NOTATION", entry.getEntryArg(0), fsi); + + catalogEntries.addElement(entry); + } else { + catalogEntries.addElement(entry); + } + } + + /** + * Handle unknown CatalogEntry types. + * + * <p>This method exists to allow subclasses to deal with unknown + * entry types.</p> + */ + public void unknownEntry(Vector strings) { + if (strings != null && strings.size() > 0) { + String keyword = (String) strings.elementAt(0); + catalogManager.debug.message(2, "Unrecognized token parsing catalog", keyword); + } + } + + /** + * Parse all subordinate catalogs. + * + * <p>This method recursively parses all of the subordinate catalogs. + * If this method does not throw an exception, you can be confident that + * no subsequent call to any resolve*() method will either, with two + * possible exceptions:</p> + * + * <ol> + * <li><p>Delegated catalogs are re-parsed each time they are needed + * (because a variable list of them may be needed in each case, + * depending on the length of the matching partial public identifier).</p> + * <p>But they are parsed by this method, so as long as they don't + * change or disappear while the program is running, they shouldn't + * generate errors later if they don't generate errors now.</p> + * <li><p>If you add new catalogs with <code>parseCatalog</code>, they + * won't be loaded until they are needed or until you call + * <code>parseAllCatalogs</code> again.</p> + * </ol> + * + * <p>On the other hand, if you don't call this method, you may + * successfully parse documents without having to load all possible + * catalogs.</p> + * + * @throws MalformedURLException The filename (URL) for a + * subordinate or delegated catalog is not a valid URL. + * @throws IOException Error reading some subordinate or delegated + * catalog file. + */ + public void parseAllCatalogs() + throws MalformedURLException, IOException { + + // Parse all the subordinate catalogs + for (int catPos = 0; catPos < catalogs.size(); catPos++) { + Catalog c = null; + + try { + c = (Catalog) catalogs.elementAt(catPos); + } catch (ClassCastException e) { + String catfile = (String) catalogs.elementAt(catPos); + c = newCatalog(); + + c.parseCatalog(catfile); + catalogs.setElementAt(c, catPos); + c.parseAllCatalogs(); + } + } + + // Parse all the DELEGATE catalogs + Enumeration en = catalogEntries.elements(); + while (en.hasMoreElements()) { + CatalogEntry e = (CatalogEntry) en.nextElement(); + if (e.getEntryType() == DELEGATE_PUBLIC + || e.getEntryType() == DELEGATE_SYSTEM + || e.getEntryType() == DELEGATE_URI) { + Catalog dcat = newCatalog(); + dcat.parseCatalog(e.getEntryArg(1)); + } + } + } + + + /** + * Return the applicable DOCTYPE system identifier. + * + * @param entityName The name of the entity (element) for which + * a doctype is required. + * @param publicId The nominal public identifier for the doctype + * (as provided in the source document). + * @param systemId The nominal system identifier for the doctype + * (as provided in the source document). + * + * @return The system identifier to use for the doctype. + * + * @throws MalformedURLException The formal system identifier of a + * subordinate catalog cannot be turned into a valid URL. + * @throws IOException Error reading subordinate catalog file. + */ + public String resolveDoctype(String entityName, + String publicId, + String systemId) + throws MalformedURLException, IOException { + String resolved = null; + + catalogManager.debug.message(3, "resolveDoctype(" + +entityName+","+publicId+","+systemId+")"); + + systemId = normalizeURI(systemId); + + if (publicId != null && publicId.startsWith("urn:publicid:")) { + publicId = PublicId.decodeURN(publicId); + } + + if (systemId != null && systemId.startsWith("urn:publicid:")) { + systemId = PublicId.decodeURN(systemId); + if (publicId != null && !publicId.equals(systemId)) { + catalogManager.debug.message(1, "urn:publicid: system identifier differs from public identifier; using public identifier"); + systemId = null; + } else { + publicId = systemId; + systemId = null; + } + } + + if (systemId != null) { + // If there's a SYSTEM entry in this catalog, use it + resolved = resolveLocalSystem(systemId); + if (resolved != null) { + return resolved; + } + } + + if (publicId != null) { + // If there's a PUBLIC entry in this catalog, use it + resolved = resolveLocalPublic(DOCTYPE, + entityName, + publicId, + systemId); + if (resolved != null) { + return resolved; + } + } + + // If there's a DOCTYPE entry in this catalog, use it + boolean over = default_override; + Enumeration en = catalogEntries.elements(); + while (en.hasMoreElements()) { + CatalogEntry e = (CatalogEntry) en.nextElement(); + if (e.getEntryType() == OVERRIDE) { + over = e.getEntryArg(0).equalsIgnoreCase("YES"); + continue; + } + + if (e.getEntryType() == DOCTYPE + && e.getEntryArg(0).equals(entityName)) { + if (over || systemId == null) { + return e.getEntryArg(1); + } + } + } + + // Otherwise, look in the subordinate catalogs + return resolveSubordinateCatalogs(DOCTYPE, + entityName, + publicId, + systemId); + } + + /** + * Return the applicable DOCUMENT entry. + * + * @return The system identifier to use for the doctype. + * + * @throws MalformedURLException The formal system identifier of a + * subordinate catalog cannot be turned into a valid URL. + * @throws IOException Error reading subordinate catalog file. + */ + public String resolveDocument() + throws MalformedURLException, IOException { + // If there's a DOCUMENT entry, return it + + catalogManager.debug.message(3, "resolveDocument"); + + Enumeration en = catalogEntries.elements(); + while (en.hasMoreElements()) { + CatalogEntry e = (CatalogEntry) en.nextElement(); + if (e.getEntryType() == DOCUMENT) { + return e.getEntryArg(0); + } + } + + return resolveSubordinateCatalogs(DOCUMENT, + null, null, null); + } + + /** + * Return the applicable ENTITY system identifier. + * + * @param entityName The name of the entity for which + * a system identifier is required. + * @param publicId The nominal public identifier for the entity + * (as provided in the source document). + * @param systemId The nominal system identifier for the entity + * (as provided in the source document). + * + * @return The system identifier to use for the entity. + * + * @throws MalformedURLException The formal system identifier of a + * subordinate catalog cannot be turned into a valid URL. + * @throws IOException Error reading subordinate catalog file. + */ + public String resolveEntity(String entityName, + String publicId, + String systemId) + throws MalformedURLException, IOException { + String resolved = null; + + catalogManager.debug.message(3, "resolveEntity(" + +entityName+","+publicId+","+systemId+")"); + + systemId = normalizeURI(systemId); + + if (publicId != null && publicId.startsWith("urn:publicid:")) { + publicId = PublicId.decodeURN(publicId); + } + + if (systemId != null && systemId.startsWith("urn:publicid:")) { + systemId = PublicId.decodeURN(systemId); + if (publicId != null && !publicId.equals(systemId)) { + catalogManager.debug.message(1, "urn:publicid: system identifier differs from public identifier; using public identifier"); + systemId = null; + } else { + publicId = systemId; + systemId = null; + } + } + + if (systemId != null) { + // If there's a SYSTEM entry in this catalog, use it + resolved = resolveLocalSystem(systemId); + if (resolved != null) { + return resolved; + } + } + + if (publicId != null) { + // If there's a PUBLIC entry in this catalog, use it + resolved = resolveLocalPublic(ENTITY, + entityName, + publicId, + systemId); + if (resolved != null) { + return resolved; + } + } + + // If there's a ENTITY entry in this catalog, use it + boolean over = default_override; + Enumeration en = catalogEntries.elements(); + while (en.hasMoreElements()) { + CatalogEntry e = (CatalogEntry) en.nextElement(); + if (e.getEntryType() == OVERRIDE) { + over = e.getEntryArg(0).equalsIgnoreCase("YES"); + continue; + } + + if (e.getEntryType() == ENTITY + && e.getEntryArg(0).equals(entityName)) { + if (over || systemId == null) { + return e.getEntryArg(1); + } + } + } + + // Otherwise, look in the subordinate catalogs + return resolveSubordinateCatalogs(ENTITY, + entityName, + publicId, + systemId); + } + + /** + * Return the applicable NOTATION system identifier. + * + * @param notationName The name of the notation for which + * a doctype is required. + * @param publicId The nominal public identifier for the notation + * (as provided in the source document). + * @param systemId The nominal system identifier for the notation + * (as provided in the source document). + * + * @return The system identifier to use for the notation. + * + * @throws MalformedURLException The formal system identifier of a + * subordinate catalog cannot be turned into a valid URL. + * @throws IOException Error reading subordinate catalog file. + */ + public String resolveNotation(String notationName, + String publicId, + String systemId) + throws MalformedURLException, IOException { + String resolved = null; + + catalogManager.debug.message(3, "resolveNotation(" + +notationName+","+publicId+","+systemId+")"); + + systemId = normalizeURI(systemId); + + if (publicId != null && publicId.startsWith("urn:publicid:")) { + publicId = PublicId.decodeURN(publicId); + } + + if (systemId != null && systemId.startsWith("urn:publicid:")) { + systemId = PublicId.decodeURN(systemId); + if (publicId != null && !publicId.equals(systemId)) { + catalogManager.debug.message(1, "urn:publicid: system identifier differs from public identifier; using public identifier"); + systemId = null; + } else { + publicId = systemId; + systemId = null; + } + } + + if (systemId != null) { + // If there's a SYSTEM entry in this catalog, use it + resolved = resolveLocalSystem(systemId); + if (resolved != null) { + return resolved; + } + } + + if (publicId != null) { + // If there's a PUBLIC entry in this catalog, use it + resolved = resolveLocalPublic(NOTATION, + notationName, + publicId, + systemId); + if (resolved != null) { + return resolved; + } + } + + // If there's a NOTATION entry in this catalog, use it + boolean over = default_override; + Enumeration en = catalogEntries.elements(); + while (en.hasMoreElements()) { + CatalogEntry e = (CatalogEntry) en.nextElement(); + if (e.getEntryType() == OVERRIDE) { + over = e.getEntryArg(0).equalsIgnoreCase("YES"); + continue; + } + + if (e.getEntryType() == NOTATION + && e.getEntryArg(0).equals(notationName)) { + if (over || systemId == null) { + return e.getEntryArg(1); + } + } + } + + // Otherwise, look in the subordinate catalogs + return resolveSubordinateCatalogs(NOTATION, + notationName, + publicId, + systemId); + } + + /** + * Return the applicable PUBLIC or SYSTEM identifier. + * + * <p>This method searches the Catalog and returns the system + * identifier specified for the given system or + * public identifiers. If + * no appropriate PUBLIC or SYSTEM entry is found in the Catalog, + * null is returned.</p> + * + * @param publicId The public identifier to locate in the catalog. + * Public identifiers are normalized before comparison. + * @param systemId The nominal system identifier for the entity + * in question (as provided in the source document). + * + * @throws MalformedURLException The formal system identifier of a + * subordinate catalog cannot be turned into a valid URL. + * @throws IOException Error reading subordinate catalog file. + * + * @return The system identifier to use. + * Note that the nominal system identifier is not returned if a + * match is not found in the catalog, instead null is returned + * to indicate that no match was found. + */ + public String resolvePublic(String publicId, String systemId) + throws MalformedURLException, IOException { + + catalogManager.debug.message(3, "resolvePublic("+publicId+","+systemId+")"); + + systemId = normalizeURI(systemId); + + if (publicId != null && publicId.startsWith("urn:publicid:")) { + publicId = PublicId.decodeURN(publicId); + } + + if (systemId != null && systemId.startsWith("urn:publicid:")) { + systemId = PublicId.decodeURN(systemId); + if (publicId != null && !publicId.equals(systemId)) { + catalogManager.debug.message(1, "urn:publicid: system identifier differs from public identifier; using public identifier"); + systemId = null; + } else { + publicId = systemId; + systemId = null; + } + } + + // If there's a SYSTEM entry in this catalog, use it + if (systemId != null) { + String resolved = resolveLocalSystem(systemId); + if (resolved != null) { + return resolved; + } + } + + // If there's a PUBLIC entry in this catalog, use it + String resolved = resolveLocalPublic(PUBLIC, + null, + publicId, + systemId); + if (resolved != null) { + return resolved; + } + + // Otherwise, look in the subordinate catalogs + return resolveSubordinateCatalogs(PUBLIC, + null, + publicId, + systemId); + } + + /** + * Return the applicable PUBLIC or SYSTEM identifier. + * + * <p>This method searches the Catalog and returns the system + * identifier specified for the given system or public identifiers. + * If no appropriate PUBLIC or SYSTEM entry is found in the Catalog, + * delegated Catalogs are interrogated.</p> + * + * <p>There are four possible cases:</p> + * + * <ul> + * <li>If the system identifier provided matches a SYSTEM entry + * in the current catalog, the SYSTEM entry is returned. + * <li>If the system identifier is not null, the PUBLIC entries + * that were encountered when OVERRIDE YES was in effect are + * interrogated and the first matching entry is returned.</li> + * <li>If the system identifier is null, then all of the PUBLIC + * entries are interrogated and the first matching entry + * is returned. This may not be the same as the preceding case, if + * some PUBLIC entries are encountered when OVERRIDE NO is in effect. In + * XML, the only place where a public identifier may occur without + * a system identifier is in a notation declaration.</li> + * <li>Finally, if the public identifier matches one of the partial + * public identifiers specified in a DELEGATE* entry in + * the Catalog, the delegated catalog is interrogated. The first + * time that the delegated catalog is required, it will be + * retrieved and parsed. It is subsequently cached. + * </li> + * </ul> + * + * @param entityType The CatalogEntry type for which this query is + * being conducted. This is necessary in order to do the approprate + * query on a delegated catalog. + * @param entityName The name of the entity being searched for, if + * appropriate. + * @param publicId The public identifier of the entity in question. + * @param systemId The nominal system identifier for the entity + * in question (as provided in the source document). + * + * @throws MalformedURLException The formal system identifier of a + * delegated catalog cannot be turned into a valid URL. + * @throws IOException Error reading delegated catalog file. + * + * @return The system identifier to use. + * Note that the nominal system identifier is not returned if a + * match is not found in the catalog, instead null is returned + * to indicate that no match was found. + */ + protected synchronized String resolveLocalPublic(int entityType, + String entityName, + String publicId, + String systemId) + throws MalformedURLException, IOException { + + // Always normalize the public identifier before attempting a match + publicId = PublicId.normalize(publicId); + + // If there's a SYSTEM entry in this catalog, use it + if (systemId != null) { + String resolved = resolveLocalSystem(systemId); + if (resolved != null) { + return resolved; + } + } + + // If there's a PUBLIC entry in this catalog, use it + boolean over = default_override; + Enumeration en = catalogEntries.elements(); + while (en.hasMoreElements()) { + CatalogEntry e = (CatalogEntry) en.nextElement(); + if (e.getEntryType() == OVERRIDE) { + over = e.getEntryArg(0).equalsIgnoreCase("YES"); + continue; + } + + if (e.getEntryType() == PUBLIC + && e.getEntryArg(0).equals(publicId)) { + if (over || systemId == null) { + return e.getEntryArg(1); + } + } + } + + // If there's a DELEGATE_PUBLIC entry in this catalog, use it + over = default_override; + en = catalogEntries.elements(); + Vector delCats = new Vector(); + while (en.hasMoreElements()) { + CatalogEntry e = (CatalogEntry) en.nextElement(); + if (e.getEntryType() == OVERRIDE) { + over = e.getEntryArg(0).equalsIgnoreCase("YES"); + continue; + } + + if (e.getEntryType() == DELEGATE_PUBLIC + && (over || systemId == null)) { + String p = (String) e.getEntryArg(0); + if (p.length() <= publicId.length() + && p.equals(publicId.substring(0, p.length()))) { + // delegate this match to the other catalog + + delCats.addElement(e.getEntryArg(1)); + } + } + } + + if (delCats.size() > 0) { + Enumeration enCats = delCats.elements(); + + if (catalogManager.debug.getDebug() > 1) { + catalogManager.debug.message(2, "Switching to delegated catalog(s):"); + while (enCats.hasMoreElements()) { + String delegatedCatalog = (String) enCats.nextElement(); + catalogManager.debug.message(2, "\t" + delegatedCatalog); + } + } + + Catalog dcat = newCatalog(); + + enCats = delCats.elements(); + while (enCats.hasMoreElements()) { + String delegatedCatalog = (String) enCats.nextElement(); + dcat.parseCatalog(delegatedCatalog); + } + + return dcat.resolvePublic(publicId, null); + } + + // Nada! + return null; + } + + /** + * Return the applicable SYSTEM system identifier. + * + * <p>If a SYSTEM entry exists in the Catalog + * for the system ID specified, return the mapped value.</p> + * + * <p>On Windows-based operating systems, the comparison between + * the system identifier provided and the SYSTEM entries in the + * Catalog is case-insensitive.</p> + * + * @param systemId The system ID to locate in the catalog. + * + * @return The resolved system identifier. + * + * @throws MalformedURLException The formal system identifier of a + * subordinate catalog cannot be turned into a valid URL. + * @throws IOException Error reading subordinate catalog file. + */ + public String resolveSystem(String systemId) + throws MalformedURLException, IOException { + + catalogManager.debug.message(3, "resolveSystem("+systemId+")"); + + systemId = normalizeURI(systemId); + + if (systemId != null && systemId.startsWith("urn:publicid:")) { + systemId = PublicId.decodeURN(systemId); + return resolvePublic(systemId, null); + } + + // If there's a SYSTEM entry in this catalog, use it + if (systemId != null) { + String resolved = resolveLocalSystem(systemId); + if (resolved != null) { + return resolved; + } + } + + // Otherwise, look in the subordinate catalogs + return resolveSubordinateCatalogs(SYSTEM, + null, + null, + systemId); + } + + /** + * Return the applicable SYSTEM system identifier in this + * catalog. + * + * <p>If a SYSTEM entry exists in the catalog file + * for the system ID specified, return the mapped value.</p> + * + * @param systemId The system ID to locate in the catalog + * + * @return The mapped system identifier or null + */ + protected String resolveLocalSystem(String systemId) + throws MalformedURLException, IOException { + + String osname = System.getProperty("os.name"); + boolean windows = (osname.indexOf("Windows") >= 0); + Enumeration en = catalogEntries.elements(); + while (en.hasMoreElements()) { + CatalogEntry e = (CatalogEntry) en.nextElement(); + if (e.getEntryType() == SYSTEM + && (e.getEntryArg(0).equals(systemId) + || (windows + && e.getEntryArg(0).equalsIgnoreCase(systemId)))) { + return e.getEntryArg(1); + } + } + + // If there's a REWRITE_SYSTEM entry in this catalog, use it + en = catalogEntries.elements(); + String startString = null; + String prefix = null; + while (en.hasMoreElements()) { + CatalogEntry e = (CatalogEntry) en.nextElement(); + + if (e.getEntryType() == REWRITE_SYSTEM) { + String p = (String) e.getEntryArg(0); + if (p.length() <= systemId.length() + && p.equals(systemId.substring(0, p.length()))) { + // Is this the longest prefix? + if (startString == null + || p.length() > startString.length()) { + startString = p; + prefix = e.getEntryArg(1); + } + } + } + } + + if (prefix != null) { + // return the systemId with the new prefix + return prefix + systemId.substring(startString.length()); + } + + // If there's a SYSTEM_SUFFIX entry in this catalog, use it + en = catalogEntries.elements(); + String suffixString = null; + String suffixURI = null; + while (en.hasMoreElements()) { + CatalogEntry e = (CatalogEntry) en.nextElement(); + + if (e.getEntryType() == SYSTEM_SUFFIX) { + String p = (String) e.getEntryArg(0); + if (p.length() <= systemId.length() + && systemId.endsWith(p)) { + // Is this the longest prefix? + if (suffixString == null + || p.length() > suffixString.length()) { + suffixString = p; + suffixURI = e.getEntryArg(1); + } + } + } + } + + if (suffixURI != null) { + // return the systemId for the suffix + return suffixURI; + } + + // If there's a DELEGATE_SYSTEM entry in this catalog, use it + en = catalogEntries.elements(); + Vector delCats = new Vector(); + while (en.hasMoreElements()) { + CatalogEntry e = (CatalogEntry) en.nextElement(); + + if (e.getEntryType() == DELEGATE_SYSTEM) { + String p = (String) e.getEntryArg(0); + if (p.length() <= systemId.length() + && p.equals(systemId.substring(0, p.length()))) { + // delegate this match to the other catalog + + delCats.addElement(e.getEntryArg(1)); + } + } + } + + if (delCats.size() > 0) { + Enumeration enCats = delCats.elements(); + + if (catalogManager.debug.getDebug() > 1) { + catalogManager.debug.message(2, "Switching to delegated catalog(s):"); + while (enCats.hasMoreElements()) { + String delegatedCatalog = (String) enCats.nextElement(); + catalogManager.debug.message(2, "\t" + delegatedCatalog); + } + } + + Catalog dcat = newCatalog(); + + enCats = delCats.elements(); + while (enCats.hasMoreElements()) { + String delegatedCatalog = (String) enCats.nextElement(); + dcat.parseCatalog(delegatedCatalog); + } + + return dcat.resolveSystem(systemId); + } + + return null; + } + + /** + * Return the applicable URI. + * + * <p>If a URI entry exists in the Catalog + * for the URI specified, return the mapped value.</p> + * + * <p>URI comparison is case sensitive.</p> + * + * @param uri The URI to locate in the catalog. + * + * @return The resolved URI. + * + * @throws MalformedURLException The system identifier of a + * subordinate catalog cannot be turned into a valid URL. + * @throws IOException Error reading subordinate catalog file. + */ + public String resolveURI(String uri) + throws MalformedURLException, IOException { + + catalogManager.debug.message(3, "resolveURI("+uri+")"); + + uri = normalizeURI(uri); + + if (uri != null && uri.startsWith("urn:publicid:")) { + uri = PublicId.decodeURN(uri); + return resolvePublic(uri, null); + } + + // If there's a URI entry in this catalog, use it + if (uri != null) { + String resolved = resolveLocalURI(uri); + if (resolved != null) { + return resolved; + } + } + + // Otherwise, look in the subordinate catalogs + return resolveSubordinateCatalogs(URI, + null, + null, + uri); + } + + /** + * Return the applicable URI in this catalog. + * + * <p>If a URI entry exists in the catalog file + * for the URI specified, return the mapped value.</p> + * + * @param uri The URI to locate in the catalog + * + * @return The mapped URI or null + */ + protected String resolveLocalURI(String uri) + throws MalformedURLException, IOException { + Enumeration en = catalogEntries.elements(); + while (en.hasMoreElements()) { + CatalogEntry e = (CatalogEntry) en.nextElement(); + if (e.getEntryType() == URI + && (e.getEntryArg(0).equals(uri))) { + return e.getEntryArg(1); + } + } + + // If there's a REWRITE_URI entry in this catalog, use it + en = catalogEntries.elements(); + String startString = null; + String prefix = null; + while (en.hasMoreElements()) { + CatalogEntry e = (CatalogEntry) en.nextElement(); + + if (e.getEntryType() == REWRITE_URI) { + String p = (String) e.getEntryArg(0); + if (p.length() <= uri.length() + && p.equals(uri.substring(0, p.length()))) { + // Is this the longest prefix? + if (startString == null + || p.length() > startString.length()) { + startString = p; + prefix = e.getEntryArg(1); + } + } + } + } + + if (prefix != null) { + // return the uri with the new prefix + return prefix + uri.substring(startString.length()); + } + + // If there's a URI_SUFFIX entry in this catalog, use it + en = catalogEntries.elements(); + String suffixString = null; + String suffixURI = null; + while (en.hasMoreElements()) { + CatalogEntry e = (CatalogEntry) en.nextElement(); + + if (e.getEntryType() == URI_SUFFIX) { + String p = (String) e.getEntryArg(0); + if (p.length() <= uri.length() + && uri.endsWith(p)) { + // Is this the longest prefix? + if (suffixString == null + || p.length() > suffixString.length()) { + suffixString = p; + suffixURI = e.getEntryArg(1); + } + } + } + } + + if (suffixURI != null) { + // return the uri for the suffix + return suffixURI; + } + + // If there's a DELEGATE_URI entry in this catalog, use it + en = catalogEntries.elements(); + Vector delCats = new Vector(); + while (en.hasMoreElements()) { + CatalogEntry e = (CatalogEntry) en.nextElement(); + + if (e.getEntryType() == DELEGATE_URI) { + String p = (String) e.getEntryArg(0); + if (p.length() <= uri.length() + && p.equals(uri.substring(0, p.length()))) { + // delegate this match to the other catalog + + delCats.addElement(e.getEntryArg(1)); + } + } + } + + if (delCats.size() > 0) { + Enumeration enCats = delCats.elements(); + + if (catalogManager.debug.getDebug() > 1) { + catalogManager.debug.message(2, "Switching to delegated catalog(s):"); + while (enCats.hasMoreElements()) { + String delegatedCatalog = (String) enCats.nextElement(); + catalogManager.debug.message(2, "\t" + delegatedCatalog); + } + } + + Catalog dcat = newCatalog(); + + enCats = delCats.elements(); + while (enCats.hasMoreElements()) { + String delegatedCatalog = (String) enCats.nextElement(); + dcat.parseCatalog(delegatedCatalog); + } + + return dcat.resolveURI(uri); + } + + return null; + } + + /** + * Search the subordinate catalogs, in order, looking for a match. + * + * <p>This method searches the Catalog and returns the system + * identifier specified for the given entity type with the given + * name, public, and system identifiers. In some contexts, these + * may be null.</p> + * + * @param entityType The CatalogEntry type for which this query is + * being conducted. This is necessary in order to do the approprate + * query on a subordinate catalog. + * @param entityName The name of the entity being searched for, if + * appropriate. + * @param publicId The public identifier of the entity in question + * (as provided in the source document). + * @param systemId The nominal system identifier for the entity + * in question (as provided in the source document). This parameter is + * overloaded for the URI entry type. + * + * @throws MalformedURLException The formal system identifier of a + * delegated catalog cannot be turned into a valid URL. + * @throws IOException Error reading delegated catalog file. + * + * @return The system identifier to use. + * Note that the nominal system identifier is not returned if a + * match is not found in the catalog, instead null is returned + * to indicate that no match was found. + */ + protected synchronized String resolveSubordinateCatalogs(int entityType, + String entityName, + String publicId, + String systemId) + throws MalformedURLException, IOException { + + for (int catPos = 0; catPos < catalogs.size(); catPos++) { + Catalog c = null; + + try { + c = (Catalog) catalogs.elementAt(catPos); + } catch (ClassCastException e) { + String catfile = (String) catalogs.elementAt(catPos); + c = newCatalog(); + + try { + c.parseCatalog(catfile); + } catch (MalformedURLException mue) { + catalogManager.debug.message(1, "Malformed Catalog URL", catfile); + } catch (FileNotFoundException fnfe) { + catalogManager.debug.message(1, "Failed to load catalog, file not found", + catfile); + } catch (IOException ioe) { + catalogManager.debug.message(1, "Failed to load catalog, I/O error", catfile); + } + + catalogs.setElementAt(c, catPos); + } + + String resolved = null; + + // Ok, now what are we supposed to call here? + if (entityType == DOCTYPE) { + resolved = c.resolveDoctype(entityName, + publicId, + systemId); + } else if (entityType == DOCUMENT) { + resolved = c.resolveDocument(); + } else if (entityType == ENTITY) { + resolved = c.resolveEntity(entityName, + publicId, + systemId); + } else if (entityType == NOTATION) { + resolved = c.resolveNotation(entityName, + publicId, + systemId); + } else if (entityType == PUBLIC) { + resolved = c.resolvePublic(publicId, systemId); + } else if (entityType == SYSTEM) { + resolved = c.resolveSystem(systemId); + } else if (entityType == URI) { + resolved = c.resolveURI(systemId); + } + + if (resolved != null) { + return resolved; + } + } + + return null; + } + + // ----------------------------------------------------------------- + + /** + * Replace backslashes with forward slashes. (URLs always use + * forward slashes.) + * + * @param sysid The input system identifier. + * @return The same system identifier with backslashes turned into + * forward slashes. + */ + protected String fixSlashes (String sysid) { + return sysid.replace('\\', '/'); + } + + /** + * Construct an absolute URI from a relative one, using the current + * base URI. + * + * @param sysid The (possibly relative) system identifier + * @return The system identifier made absolute with respect to the + * current {@link #base}. + */ + protected String makeAbsolute(String sysid) { + URL local = null; + + sysid = fixSlashes(sysid); + + try { + local = new URL(base, sysid); + } catch (MalformedURLException e) { + catalogManager.debug.message(1, "Malformed URL on system identifier", sysid); + } + + if (local != null) { + return local.toString(); + } else { + return sysid; + } + } + + /** + * Perform character normalization on a URI reference. + * + * @param uriref The URI reference + * @return The normalized URI reference. + */ + protected String normalizeURI(String uriref) { + String newRef = ""; + byte[] bytes; + + if (uriref == null) { + return null; + } + + try { + bytes = uriref.getBytes("UTF-8"); + } catch (UnsupportedEncodingException uee) { + // this can't happen + catalogManager.debug.message(1, "UTF-8 is an unsupported encoding!?"); + return uriref; + } + + for (int count = 0; count < bytes.length; count++) { + int ch = bytes[count] & 0xFF; + + if ((ch <= 0x20) // ctrl + || (ch > 0x7F) // high ascii + || (ch == 0x22) // " + || (ch == 0x3C) // < + || (ch == 0x3E) // > + || (ch == 0x5C) // \ + || (ch == 0x5E) // ^ + || (ch == 0x60) // ` + || (ch == 0x7B) // { + || (ch == 0x7C) // | + || (ch == 0x7D) // } + || (ch == 0x7F)) { + newRef += encodedByte(ch); + } else { + newRef += (char) bytes[count]; + } + } + + return newRef; + } + + /** + * Perform %-encoding on a single byte. + * + * @param b The 8-bit integer that represents th byte. (Bytes are signed + but encoding needs to look at the bytes unsigned.) + * @return The %-encoded string for the byte in question. + */ + protected String encodedByte (int b) { + String hex = Integer.toHexString(b).toUpperCase(); + if (hex.length() < 2) { + return "%0" + hex; + } else { + return "%" + hex; + } + } + + // ----------------------------------------------------------------- + + /** + * Add to the current list of delegated catalogs. + * + * <p>This method always constructs the {@link #localDelegate} + * vector so that it is ordered by length of partial + * public identifier.</p> + * + * @param entry The DELEGATE catalog entry + */ + protected void addDelegate(CatalogEntry entry) { + int pos = 0; + String partial = entry.getEntryArg(0); + + Enumeration local = localDelegate.elements(); + while (local.hasMoreElements()) { + CatalogEntry dpe = (CatalogEntry) local.nextElement(); + String dp = dpe.getEntryArg(0); + if (dp.equals(partial)) { + // we already have this prefix + return; + } + if (dp.length() > partial.length()) { + pos++; + } + if (dp.length() < partial.length()) { + break; + } + } + + // now insert partial into the vector at [pos] + if (localDelegate.size() == 0) { + localDelegate.addElement(entry); + } else { + localDelegate.insertElementAt(entry, pos); + } + } +} + diff --git a/o.apache.xml.resolver/patch-src/org/apache/xml/resolver/CatalogManager.java b/o.apache.xml.resolver/patch-src/org/apache/xml/resolver/CatalogManager.java new file mode 100644 index 000000000..3ec0fea12 --- /dev/null +++ b/o.apache.xml.resolver/patch-src/org/apache/xml/resolver/CatalogManager.java @@ -0,0 +1,838 @@ +// CatalogManager.java - Access CatalogManager.properties + +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.xml.resolver; + +import java.io.InputStream; + +import java.net.URL; +import java.net.MalformedURLException; + +import java.util.MissingResourceException; +import java.util.PropertyResourceBundle; +import java.util.ResourceBundle; +import java.util.StringTokenizer; +import java.util.Vector; + +import org.apache.xml.resolver.helpers.Debug; +import org.apache.xml.resolver.helpers.BootstrapResolver; +import org.apache.xml.resolver.Catalog; + +/** + * CatalogManager provides an interface to the catalog properties. + * + * <p>Properties can come from two places: from system properties or + * from a <i>CatalogManager.properties</i> file. This class provides a transparent + * interface to both, with system properties preferred over property file values.</p> + * + * <p>The following table summarizes the properties:</p> + * + * <table border="1"> + * <thead> + * <tr> + * <td>System Property</td> + * <td>CatalogManager.properties<br/>Property</td> + * <td>Description</td> + * </tr> + * </thead> + * <tbody> + * <tr> + * <td>xml.catalog.ignoreMissing</td> + * <td>&#160;</td> + * <td>If true, a missing <i>CatalogManager.properties</i> file or missing properties + * within that file will not generate warning messages. See also the + * <i>ignoreMissingProperties</i> method.</td> + * </tr> + * + * <tr> + * <td>xml.catalog.files</td> + * <td>catalogs</td> + * <td>The <emph>semicolon-delimited</emph> list of catalog files.</td> + * </tr> + * + * <tr> + * <td>&#160;</td> + * <td>relative-catalogs</td> + * <td>If false, relative catalog URIs are made absolute with respect to the base URI of + * the <i>CatalogManager.properties</i> file. This setting only applies to catalog + * URIs obtained from the <i>catalogs</i> property <emph>in the</emph> + * <i>CatalogManager.properties</i> file</td> + * </tr> + * + * <tr> + * <td>xml.catalog.verbosity</td> + * <td>verbosity</td> + * <td>If non-zero, the Catalog classes will print informative and debugging messages. + * The higher the number, the more messages.</td> + * </tr> + * + * <tr> + * <td>xml.catalog.prefer</td> + * <td>prefer</td> + * <td>Which identifier is preferred, "public" or "system"?</td> + * </tr> + * + * <tr> + * <td>xml.catalog.staticCatalog</td> + * <td>static-catalog</td> + * <td>Should a single catalog be constructed for all parsing, or should a different + * catalog be created for each parser?</td> + * </tr> + * + * <tr> + * <td>xml.catalog.allowPI</td> + * <td>allow-oasis-xml-catalog-pi</td> + * <td>If the source document contains "oasis-xml-catalog" processing instructions, + * should they be used?</td> + * </tr> + * + * <tr> + * <td>xml.catalog.className</td> + * <td>catalog-class-name</td> + * <td>If you're using the convenience classes + * <tt>org.apache.xml.resolver.tools.*</tt>), this setting + * allows you to specify an alternate class name to use for the underlying + * catalog.</td> + * </tr> + * </tbody> + * </table> + * + * @see Catalog + * + * @author Norman Walsh + * <a href="mailto:Norman.Walsh@Sun.COM">Norman.Walsh@Sun.COM</a> + * + * @version 1.0 + */ + +public class CatalogManager { + private static String pFiles = "xml.catalog.files"; + private static String pVerbosity = "xml.catalog.verbosity"; + private static String pPrefer = "xml.catalog.prefer"; + private static String pStatic = "xml.catalog.staticCatalog"; + private static String pAllowPI = "xml.catalog.allowPI"; + private static String pClassname = "xml.catalog.className"; + private static String pIgnoreMissing = "xml.catalog.ignoreMissing"; + + /** A static CatalogManager instance for sharing */ + private static CatalogManager staticManager = new CatalogManager(); + + /** The bootstrap resolver to use when loading XML Catalogs. */ + private BootstrapResolver bResolver = new BootstrapResolver(); + + /** Flag to ignore missing property files and/or properties */ + private boolean ignoreMissingProperties + = (System.getProperty(pIgnoreMissing) != null + || System.getProperty(pFiles) != null); + + /** Holds the resources after they are loaded from the file. */ + private ResourceBundle resources; + + /** The name of the CatalogManager properties file. */ + private String propertyFile = "CatalogManager.properties"; + + /** The location of the propertyFile */ + private URL propertyFileURI = null; + + /** Default catalog files list. */ + private String defaultCatalogFiles = "./xcatalog"; + + /** Current catalog files list. */ + private String catalogFiles = null; + + /** Did the catalogFiles come from the properties file? */ + private boolean fromPropertiesFile = false; + + /** Default verbosity level if there is no property setting for it. */ + private int defaultVerbosity = 1; + + /** Current verbosity level. */ + private Integer verbosity = null; + + /** Default preference setting. */ + private boolean defaultPreferPublic = true; + + /** Current preference setting. */ + private Boolean preferPublic = null; + + /** Default setting of the static catalog flag. */ + private boolean defaultUseStaticCatalog = true; + + /** Current setting of the static catalog flag. */ + private Boolean useStaticCatalog = null; + + /** The static catalog used by this manager. */ + private static Catalog staticCatalog = null; + + /** Default setting of the oasisXMLCatalogPI flag. */ + private boolean defaultOasisXMLCatalogPI = true; + + /** Current setting of the oasisXMLCatalogPI flag. */ + private Boolean oasisXMLCatalogPI = null; + + /** Default setting of the relativeCatalogs flag. */ + private boolean defaultRelativeCatalogs = true; + + /** Current setting of the relativeCatalogs flag. */ + private Boolean relativeCatalogs = null; + + /** Current catalog class name. */ + private String catalogClassName = null; + + /** The manager's debug object. Used for printing debugging messages. + * + * <p>This field is public so that objects that have access to this + * CatalogManager can use this debug object.</p> + */ + public Debug debug = null; + + /** Constructor. */ + public CatalogManager() { + debug = new Debug(); + // Note that we don't setDebug() here; we do that lazily. Either the + // user will set it explicitly, or we'll do it automagically if they + // read from the propertyFile for some other reason. That way, there's + // no attempt to read from the file before the caller has had a chance + // to avoid it. + } + + /** Constructor that specifies an explicit property file. */ + public CatalogManager(String propertyFile) { + this.propertyFile = propertyFile; + + debug = new Debug(); + // Note that we don't setDebug() here; we do that lazily. Either the + // user will set it explicitly, or we'll do it automagically if they + // read from the propertyFile for some other reason. That way, there's + // no attempt to read from the file before the caller has had a chance + // to avoid it. + } + + /** Set the bootstrap resolver.*/ + public void setBootstrapResolver(BootstrapResolver resolver) { + bResolver = resolver; + } + + /** Get the bootstrap resolver.*/ + public BootstrapResolver getBootstrapResolver() { + return bResolver; + } + + /** + * Load the properties from the propertyFile and build the + * resources from it. + */ + private synchronized void readProperties() { + if (propertyFile == null) { + return; + } + try { + propertyFileURI = CatalogManager.class.getResource("/"+propertyFile); + InputStream in = + CatalogManager.class.getResourceAsStream("/"+propertyFile); + if (in==null) { + if (!ignoreMissingProperties) { + System.err.println("Cannot find "+propertyFile); + // there's no reason to give this warning more than once + ignoreMissingProperties = true; + } + return; + } + resources = new PropertyResourceBundle(in); + } catch (MissingResourceException mre) { + if (!ignoreMissingProperties) { + System.err.println("Cannot read "+propertyFile); + } + } catch (java.io.IOException e) { + if (!ignoreMissingProperties) { + System.err.println("Failure trying to read "+propertyFile); + } + } + + // This is a bit of a hack. After we've successfully read the properties, + // use them to set the default debug level, if the user hasn't already set + // the default debug level. + if (verbosity == null) { + try { + String verbStr = resources.getString("verbosity"); + int verb = Integer.parseInt(verbStr.trim()); + debug.setDebug(verb); + verbosity = new Integer(verb); + } catch (Exception e) { + // nop + } + } + } + + /** + * Allow access to the static CatalogManager + */ + public static CatalogManager getStaticManager() { + return staticManager; + } + + /** + * How are missing properties handled? + * + * <p>If true, missing or unreadable property files will + * not be reported. Otherwise, a message will be sent to System.err. + * </p> + */ + public boolean getIgnoreMissingProperties() { + return ignoreMissingProperties; + } + + /** + * How should missing properties be handled? + * + * <p>If ignore is true, missing or unreadable property files will + * not be reported. Otherwise, a message will be sent to System.err. + * </p> + */ + public void setIgnoreMissingProperties(boolean ignore) { + ignoreMissingProperties = ignore; + } + + /** + * How are missing properties handled? + * + * <p>If ignore is true, missing or unreadable property files will + * not be reported. Otherwise, a message will be sent to System.err. + * </p> + * + * @deprecated No longer static; use get/set methods. + */ + public void ignoreMissingProperties(boolean ignore) { + setIgnoreMissingProperties(ignore); + } + + /** + * Obtain the verbosity setting from the properties. + * + * @return The verbosity level from the propertyFile or the + * defaultVerbosity. + */ + private int queryVerbosity () { + String defaultVerbStr = Integer.toString(defaultVerbosity); + + String verbStr = System.getProperty(pVerbosity); + + if (verbStr == null) { + if (resources==null) readProperties(); + if (resources != null) { + try { + verbStr = resources.getString("verbosity"); + } catch (MissingResourceException e) { + verbStr = defaultVerbStr; + } + } else { + verbStr = defaultVerbStr; + } + } + + int verb = defaultVerbosity; + + try { + verb = Integer.parseInt(verbStr.trim()); + } catch (Exception e) { + System.err.println("Cannot parse verbosity: \"" + verbStr + "\""); + } + + // This is a bit of a hack. After we've successfully got the verbosity, + // we have to use it to set the default debug level, + // if the user hasn't already set the default debug level. + if (verbosity == null) { + debug.setDebug(verb); + verbosity = new Integer(verb); + } + + return verb; + } + + /** + * What is the current verbosity? + */ + public int getVerbosity() { + if (verbosity == null) { + verbosity = new Integer(queryVerbosity()); + } + + return verbosity.intValue(); + } + + /** + * Set the current verbosity. + */ + public void setVerbosity (int verbosity) { + this.verbosity = new Integer(verbosity); + debug.setDebug(verbosity); + } + + /** + * What is the current verbosity? + * + * @deprecated No longer static; use get/set methods. + */ + public int verbosity () { + return getVerbosity(); + } + + /** + * Obtain the relativeCatalogs setting from the properties. + * + * @return The relativeCatalogs setting from the propertyFile or the + * defaultRelativeCatalogs. + */ + private boolean queryRelativeCatalogs () { + if (resources==null) readProperties(); + + if (resources==null) return defaultRelativeCatalogs; + + try { + String allow = resources.getString("relative-catalogs"); + return (allow.equalsIgnoreCase("true") + || allow.equalsIgnoreCase("yes") + || allow.equalsIgnoreCase("1")); + } catch (MissingResourceException e) { + return defaultRelativeCatalogs; + } + } + + /** + * Get the relativeCatalogs setting. + * + * <p>This property is used when the catalogFiles property is + * interrogated. If true, then relative catalog entry file names + * are returned. If false, relative catalog entry file names are + * made absolute with respect to the properties file before returning + * them.</p> + * + * <p>This property <emph>only applies</emph> when the catalog files + * come from a properties file. If they come from a system property or + * the default list, they are never considered relative. (What would + * they be relative to?)</p> + * + * <p>In the properties, a value of 'yes', 'true', or '1' is considered + * true, anything else is false.</p> + * + * @return The relativeCatalogs setting from the propertyFile or the + * defaultRelativeCatalogs. + */ + public boolean getRelativeCatalogs () { + if (relativeCatalogs == null) { + relativeCatalogs = new Boolean(queryRelativeCatalogs()); + } + + return relativeCatalogs.booleanValue(); + } + + /** + * Set the relativeCatalogs setting. + * + * @see #getRelativeCatalogs() + */ + public void setRelativeCatalogs (boolean relative) { + relativeCatalogs = new Boolean(relative); + } + + /** + * Get the relativeCatalogs setting. + * + * @deprecated No longer static; use get/set methods. + */ + public boolean relativeCatalogs () { + return getRelativeCatalogs(); + } + + /** + * Obtain the list of catalog files from the properties. + * + * @return A semicolon delimited list of catlog file URIs + */ + private String queryCatalogFiles () { + String catalogList = System.getProperty(pFiles); + fromPropertiesFile = false; + + if (catalogList == null) { + if (resources == null) readProperties(); + if (resources != null) { + try { + catalogList = resources.getString("catalogs"); + fromPropertiesFile = true; + } catch (MissingResourceException e) { + System.err.println(propertyFile + ": catalogs not found."); + catalogList = null; + } + } + } + + if (catalogList == null) { + catalogList = defaultCatalogFiles; + } + + return catalogList; + } + + /** + * Return the current list of catalog files. + * + * @return A vector of the catalog file names or null if no catalogs + * are available in the properties. + */ + public Vector getCatalogFiles() { + if (catalogFiles == null) { + catalogFiles = queryCatalogFiles(); + } + + StringTokenizer files = new StringTokenizer(catalogFiles, ";"); + Vector catalogs = new Vector(); + while (files.hasMoreTokens()) { + String catalogFile = files.nextToken(); + URL absURI = null; + + if (fromPropertiesFile && !relativeCatalogs()) { + try { + absURI = new URL(propertyFileURI, catalogFile); + catalogFile = absURI.toString(); + } catch (MalformedURLException mue) { + absURI = null; + } + } + + catalogs.add(catalogFile); + } + + return catalogs; + } + + /** + * Set the list of catalog files. + */ + public void setCatalogFiles(String fileList) { + catalogFiles = fileList; + fromPropertiesFile = false; + } + + /** + * Return the current list of catalog files. + * + * @return A vector of the catalog file names or null if no catalogs + * are available in the properties. + * + * @deprecated No longer static; use get/set methods. + */ + public Vector catalogFiles() { + return getCatalogFiles(); + } + + /** + * Obtain the preferPublic setting from the properties. + * + * <p>In the properties, a value of 'public' is true, + * anything else is false.</p> + * + * @return True if prefer is public or the + * defaultPreferSetting. + */ + private boolean queryPreferPublic () { + String prefer = System.getProperty(pPrefer); + + if (prefer == null) { + if (resources==null) readProperties(); + if (resources==null) return defaultPreferPublic; + try { + prefer = resources.getString("prefer"); + } catch (MissingResourceException e) { + return defaultPreferPublic; + } + } + + if (prefer == null) { + return defaultPreferPublic; + } + + return (prefer.equalsIgnoreCase("public")); + } + + /** + * Return the current prefer public setting. + * + * @return True if public identifiers are preferred. + */ + public boolean getPreferPublic () { + if (preferPublic == null) { + preferPublic = new Boolean(queryPreferPublic()); + } + return preferPublic.booleanValue(); + } + + /** + * Set the prefer public setting. + */ + public void setPreferPublic (boolean preferPublic) { + this.preferPublic = new Boolean(preferPublic); + } + + /** + * Return the current prefer public setting. + * + * @return True if public identifiers are preferred. + * + * @deprecated No longer static; use get/set methods. + */ + public boolean preferPublic () { + return getPreferPublic(); + } + + /** + * Obtain the static-catalog setting from the properties. + * + * <p>In the properties, a value of 'yes', 'true', or '1' is considered + * true, anything else is false.</p> + * + * @return The static-catalog setting from the propertyFile or the + * defaultUseStaticCatalog. + */ + private boolean queryUseStaticCatalog () { + String staticCatalog = System.getProperty(pStatic); + + if (staticCatalog == null) { + if (resources==null) readProperties(); + if (resources==null) return defaultUseStaticCatalog; + try { + staticCatalog = resources.getString("static-catalog"); + } catch (MissingResourceException e) { + return defaultUseStaticCatalog; + } + } + + if (staticCatalog == null) { + return defaultUseStaticCatalog; + } + + return (staticCatalog.equalsIgnoreCase("true") + || staticCatalog.equalsIgnoreCase("yes") + || staticCatalog.equalsIgnoreCase("1")); + } + + /** + * Get the current use static catalog setting. + */ + public boolean getUseStaticCatalog() { + if (useStaticCatalog == null) { + useStaticCatalog = new Boolean(queryUseStaticCatalog()); + } + + return useStaticCatalog.booleanValue(); + } + + /** + * Set the use static catalog setting. + */ + public void setUseStaticCatalog(boolean useStatic) { + useStaticCatalog = new Boolean(useStatic); + } + + /** + * Get the current use static catalog setting. + * + * @deprecated No longer static; use get/set methods. + */ + public boolean staticCatalog() { + return getUseStaticCatalog(); + } + + /** + * Get a new catalog instance. + * + * This method always returns a new instance of the underlying catalog class. + */ + public Catalog getPrivateCatalog() { + Catalog catalog = staticCatalog; + + if (useStaticCatalog == null) { + useStaticCatalog = new Boolean(getUseStaticCatalog()); + } + + if (catalog == null || !useStaticCatalog.booleanValue()) { + + try { + String catalogClassName = getCatalogClassName(); + + if (catalogClassName == null) { + catalog = new Catalog(); + } else { + try { + catalog = (Catalog) Class.forName(catalogClassName).newInstance(); + } catch (ClassNotFoundException cnfe) { + debug.message(1,"Catalog class named '" + + catalogClassName + + "' could not be found. Using default."); + catalog = new Catalog(); + } catch (ClassCastException cnfe) { + debug.message(1,"Class named '" + + catalogClassName + + "' is not a Catalog. Using default."); + catalog = new Catalog(); + } + } + + catalog.setCatalogManager(this); + catalog.setupReaders(); + catalog.loadSystemCatalogs(); + } catch (Exception ex) { + ex.printStackTrace(); + } + + if (useStaticCatalog.booleanValue()) { + staticCatalog = catalog; + } + } + + return catalog; + } + + /** + * Get a catalog instance. + * + * If this manager uses static catalogs, the same static catalog will + * always be returned. Otherwise a new catalog will be returned. + */ + public Catalog getCatalog() { + Catalog catalog = staticCatalog; + + if (useStaticCatalog == null) { + useStaticCatalog = new Boolean(getUseStaticCatalog()); + } + + if (catalog == null || !useStaticCatalog.booleanValue()) { + catalog = getPrivateCatalog(); + if (useStaticCatalog.booleanValue()) { + staticCatalog = catalog; + } + } + + return catalog; + } + + /** + * <p>Obtain the oasisXMLCatalogPI setting from the properties.</p> + * + * <p>In the properties, a value of 'yes', 'true', or '1' is considered + * true, anything else is false.</p> + * + * @return The oasisXMLCatalogPI setting from the propertyFile or the + * defaultOasisXMLCatalogPI. + */ + public boolean queryAllowOasisXMLCatalogPI () { + String allow = System.getProperty(pAllowPI); + + if (allow == null) { + if (resources==null) readProperties(); + if (resources==null) return defaultOasisXMLCatalogPI; + try { + allow = resources.getString("allow-oasis-xml-catalog-pi"); + } catch (MissingResourceException e) { + return defaultOasisXMLCatalogPI; + } + } + + if (allow == null) { + return defaultOasisXMLCatalogPI; + } + + return (allow.equalsIgnoreCase("true") + || allow.equalsIgnoreCase("yes") + || allow.equalsIgnoreCase("1")); + } + + /** + * Get the current XML Catalog PI setting. + */ + public boolean getAllowOasisXMLCatalogPI () { + if (oasisXMLCatalogPI == null) { + oasisXMLCatalogPI = new Boolean(queryAllowOasisXMLCatalogPI()); + } + + return oasisXMLCatalogPI.booleanValue(); + } + + /** + * Set the XML Catalog PI setting + */ + public void setAllowOasisXMLCatalogPI(boolean allowPI) { + oasisXMLCatalogPI = new Boolean(allowPI); + } + + /** + * Get the current XML Catalog PI setting. + * + * @deprecated No longer static; use get/set methods. + */ + public boolean allowOasisXMLCatalogPI() { + return getAllowOasisXMLCatalogPI(); + } + + /** + * Obtain the Catalog class name setting from the properties. + * + */ + public String queryCatalogClassName () { + String className = System.getProperty(pClassname); + + if (className == null) { + if (resources==null) readProperties(); + if (resources==null) return null; + try { + return resources.getString("catalog-class-name"); + } catch (MissingResourceException e) { + return null; + } + } + + return className; + } + + /** + * Get the current Catalog class name. + */ + public String getCatalogClassName() { + if (catalogClassName == null) { + catalogClassName = queryCatalogClassName(); + } + + return catalogClassName; + } + + /** + * Set the Catalog class name. + */ + public void setCatalogClassName(String className) { + catalogClassName = className; + } + + /** + * Get the current Catalog class name. + * + * @deprecated No longer static; use get/set methods. + */ + public String catalogClassName() { + return getCatalogClassName(); + } +} diff --git a/o.apache.xml.resolver/patch-src/org/apache/xml/resolver/NbCatalogManager.java b/o.apache.xml.resolver/patch-src/org/apache/xml/resolver/NbCatalogManager.java new file mode 100644 index 000000000..b6230d536 --- /dev/null +++ b/o.apache.xml.resolver/patch-src/org/apache/xml/resolver/NbCatalogManager.java @@ -0,0 +1,570 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.xml.resolver; + +import java.io.IOException; +import java.io.InputStream; +import java.io.PrintStream; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.MissingResourceException; +import java.util.PropertyResourceBundle; +import java.util.ResourceBundle; +import java.util.StringTokenizer; +import java.util.Vector; +import org.apache.xml.resolver.helpers.BootstrapResolver; +import org.apache.xml.resolver.helpers.Debug; + +public class NbCatalogManager + extends CatalogManager +{ + private static String pFiles = "xml.catalog.files"; + private static String pVerbosity = "xml.catalog.verbosity"; + private static String pPrefer = "xml.catalog.prefer"; + private static String pStatic = "xml.catalog.staticCatalog"; + private static String pAllowPI = "xml.catalog.allowPI"; + private static String pClassname = "xml.catalog.className"; + private static String pIgnoreMissing = "xml.catalog.ignoreMissing"; + private static NbCatalogManager staticManager = new NbCatalogManager(); + private BootstrapResolver bResolver = new BootstrapResolver(); + private boolean ignoreMissingProperties = (System.getProperty(pIgnoreMissing) != null) || (System.getProperty(pFiles) != null); + private ResourceBundle resources; + private String propertyFile = "CatalogManager.properties"; + private URL propertyFileURI = null; + private String defaultCatalogFiles = "./xcatalog"; + private String catalogFiles = null; + private boolean fromPropertiesFile = false; + private int defaultVerbosity = 1; + private Integer verbosity = null; + private boolean defaultPreferPublic = true; + private Boolean preferPublic = null; + private boolean defaultUseStaticCatalog = true; + private Boolean useStaticCatalog = null; + private static Catalog staticCatalog = null; + private boolean defaultOasisXMLCatalogPI = true; + private Boolean oasisXMLCatalogPI = null; + private boolean defaultRelativeCatalogs = true; + private Boolean relativeCatalogs = null; + private String catalogClassName = null; + public Debug debug = null; + + public NbCatalogManager() + { + this.debug = new Debug(); + } + + public NbCatalogManager(String propertyFile) + { + this.propertyFile = propertyFile; + + this.debug = new Debug(); + } + + public void setBootstrapResolver(BootstrapResolver resolver) + { + this.bResolver = resolver; + } + + public BootstrapResolver getBootstrapResolver() + { + return this.bResolver; + } + + private synchronized void readProperties() + { + if (this.propertyFile == null) { + return; + } + try + { + this.propertyFileURI = NbCatalogManager.class.getResource("/" + this.propertyFile); + InputStream in = NbCatalogManager.class.getResourceAsStream("/" + this.propertyFile); + if (in == null) + { + if (!this.ignoreMissingProperties) + { + this.debug.message(2, "Cannot find " + this.propertyFile); + + this.ignoreMissingProperties = true; + } + return; + } + this.resources = new PropertyResourceBundle(in); + } + catch (MissingResourceException mre) + { + if (!this.ignoreMissingProperties) { + System.err.println("Cannot read " + this.propertyFile); + } + } + catch (IOException e) + { + if (!this.ignoreMissingProperties) { + System.err.println("Failure trying to read " + this.propertyFile); + } + } + if (this.verbosity == null) { + try + { + String verbStr = this.resources.getString("verbosity"); + int verb = Integer.parseInt(verbStr.trim()); + this.debug.setDebug(verb); + this.verbosity = new Integer(verb); + } + catch (Exception e) {} + } + } + + public static CatalogManager getStaticManager() + { + return staticManager; + } + + public boolean getIgnoreMissingProperties() + { + return this.ignoreMissingProperties; + } + + public void setIgnoreMissingProperties(boolean ignore) + { + this.ignoreMissingProperties = ignore; + } + + /** + * @deprecated + */ + public void ignoreMissingProperties(boolean ignore) + { + setIgnoreMissingProperties(ignore); + } + + private int queryVerbosity() + { + String defaultVerbStr = Integer.toString(this.defaultVerbosity); + + String verbStr = System.getProperty(pVerbosity); + if (verbStr == null) + { + if (this.resources == null) { + readProperties(); + } + if (this.resources != null) { + try + { + verbStr = this.resources.getString("verbosity"); + } + catch (MissingResourceException e) + { + verbStr = defaultVerbStr; + } + } else { + verbStr = defaultVerbStr; + } + } + int verb = this.defaultVerbosity; + try + { + verb = Integer.parseInt(verbStr.trim()); + } + catch (Exception e) + { + System.err.println("Cannot parse verbosity: \"" + verbStr + "\""); + } + if (this.verbosity == null) + { + this.debug.setDebug(verb); + this.verbosity = new Integer(verb); + } + return verb; + } + + public int getVerbosity() + { + if (this.verbosity == null) { + this.verbosity = new Integer(queryVerbosity()); + } + return this.verbosity.intValue(); + } + + public void setVerbosity(int verbosity) + { + this.verbosity = new Integer(verbosity); + this.debug.setDebug(verbosity); + } + + /** + * @deprecated + */ + public int verbosity() + { + return getVerbosity(); + } + + private boolean queryRelativeCatalogs() + { + if (this.resources == null) { + readProperties(); + } + if (this.resources == null) { + return this.defaultRelativeCatalogs; + } + try + { + String allow = this.resources.getString("relative-catalogs"); + return (allow.equalsIgnoreCase("true")) || (allow.equalsIgnoreCase("yes")) || (allow.equalsIgnoreCase("1")); + } + catch (MissingResourceException e) {} + return this.defaultRelativeCatalogs; + } + + public boolean getRelativeCatalogs() + { + if (this.relativeCatalogs == null) { + this.relativeCatalogs = new Boolean(queryRelativeCatalogs()); + } + return this.relativeCatalogs.booleanValue(); + } + + public void setRelativeCatalogs(boolean relative) + { + this.relativeCatalogs = new Boolean(relative); + } + + /** + * @deprecated + */ + public boolean relativeCatalogs() + { + return getRelativeCatalogs(); + } + + private String queryCatalogFiles() + { + String catalogList = System.getProperty(pFiles); + this.fromPropertiesFile = false; + if (catalogList == null) + { + if (this.resources == null) { + readProperties(); + } + if (this.resources != null) { + try + { + catalogList = this.resources.getString("catalogs"); + this.fromPropertiesFile = true; + } + catch (MissingResourceException e) + { + System.err.println(this.propertyFile + ": catalogs not found."); + catalogList = null; + } + } + } + if (catalogList == null) { + catalogList = this.defaultCatalogFiles; + } + return catalogList; + } + + public Vector getCatalogFiles() + { + if (this.catalogFiles == null) { + this.catalogFiles = queryCatalogFiles(); + } + StringTokenizer files = new StringTokenizer(this.catalogFiles, ";"); + Vector catalogs = new Vector(); + while (files.hasMoreTokens()) + { + String catalogFile = files.nextToken(); + URL absURI = null; + if ((this.fromPropertiesFile) && (!relativeCatalogs())) { + try + { + absURI = new URL(this.propertyFileURI, catalogFile); + catalogFile = absURI.toString(); + } + catch (MalformedURLException mue) + { + absURI = null; + } + } + catalogs.add(catalogFile); + } + return catalogs; + } + + public void setCatalogFiles(String fileList) + { + this.catalogFiles = fileList; + this.fromPropertiesFile = false; + } + + /** + * @deprecated + */ + public Vector catalogFiles() + { + return getCatalogFiles(); + } + + private boolean queryPreferPublic() + { + String prefer = System.getProperty(pPrefer); + if (prefer == null) + { + if (this.resources == null) { + readProperties(); + } + if (this.resources == null) { + return this.defaultPreferPublic; + } + try + { + prefer = this.resources.getString("prefer"); + } + catch (MissingResourceException e) + { + return this.defaultPreferPublic; + } + } + if (prefer == null) { + return this.defaultPreferPublic; + } + return prefer.equalsIgnoreCase("public"); + } + + public boolean getPreferPublic() + { + if (this.preferPublic == null) { + this.preferPublic = new Boolean(queryPreferPublic()); + } + return this.preferPublic.booleanValue(); + } + + public void setPreferPublic(boolean preferPublic) + { + this.preferPublic = new Boolean(preferPublic); + } + + /** + * @deprecated + */ + public boolean preferPublic() + { + return getPreferPublic(); + } + + private boolean queryUseStaticCatalog() + { + String staticCatalog = System.getProperty(pStatic); + if (staticCatalog == null) + { + if (this.resources == null) { + readProperties(); + } + if (this.resources == null) { + return this.defaultUseStaticCatalog; + } + try + { + staticCatalog = this.resources.getString("static-catalog"); + } + catch (MissingResourceException e) + { + return this.defaultUseStaticCatalog; + } + } + if (staticCatalog == null) { + return this.defaultUseStaticCatalog; + } + return (staticCatalog.equalsIgnoreCase("true")) || (staticCatalog.equalsIgnoreCase("yes")) || (staticCatalog.equalsIgnoreCase("1")); + } + + public boolean getUseStaticCatalog() + { + if (this.useStaticCatalog == null) { + this.useStaticCatalog = new Boolean(queryUseStaticCatalog()); + } + return this.useStaticCatalog.booleanValue(); + } + + public void setUseStaticCatalog(boolean useStatic) + { + this.useStaticCatalog = new Boolean(useStatic); + } + + /** + * @deprecated + */ + public boolean staticCatalog() + { + return getUseStaticCatalog(); + } + + public Catalog getPrivateCatalog() + { + Catalog catalog = staticCatalog; + if (this.useStaticCatalog == null) { + this.useStaticCatalog = new Boolean(getUseStaticCatalog()); + } + if ((catalog == null) || (!this.useStaticCatalog.booleanValue())) + { + try + { + String catalogClassName = getCatalogClassName(); + if (catalogClassName == null) { + catalog = new Catalog(); + } else { + try + { + catalog = (Catalog)Class.forName(catalogClassName).newInstance(); + } + catch (ClassNotFoundException cnfe) + { + this.debug.message(1, "Catalog class named '" + catalogClassName + "' could not be found. Using default."); + + catalog = new Catalog(); + } + catch (ClassCastException cnfe) + { + this.debug.message(1, "Class named '" + catalogClassName + "' is not a Catalog. Using default."); + + catalog = new Catalog(); + } + } + catalog.setCatalogManager(this); + catalog.setupReaders(); + catalog.loadSystemCatalogs(); + } + catch (Exception ex) + { + ex.printStackTrace(); + } + if (this.useStaticCatalog.booleanValue()) { + staticCatalog = catalog; + } + } + return catalog; + } + + public Catalog getCatalog() + { + Catalog catalog = staticCatalog; + if (this.useStaticCatalog == null) { + this.useStaticCatalog = new Boolean(getUseStaticCatalog()); + } + if ((catalog == null) || (!this.useStaticCatalog.booleanValue())) + { + catalog = getPrivateCatalog(); + if (this.useStaticCatalog.booleanValue()) { + staticCatalog = catalog; + } + } + return catalog; + } + + public boolean queryAllowOasisXMLCatalogPI() + { + String allow = System.getProperty(pAllowPI); + if (allow == null) + { + if (this.resources == null) { + readProperties(); + } + if (this.resources == null) { + return this.defaultOasisXMLCatalogPI; + } + try + { + allow = this.resources.getString("allow-oasis-xml-catalog-pi"); + } + catch (MissingResourceException e) + { + return this.defaultOasisXMLCatalogPI; + } + } + if (allow == null) { + return this.defaultOasisXMLCatalogPI; + } + return (allow.equalsIgnoreCase("true")) || (allow.equalsIgnoreCase("yes")) || (allow.equalsIgnoreCase("1")); + } + + public boolean getAllowOasisXMLCatalogPI() + { + if (this.oasisXMLCatalogPI == null) { + this.oasisXMLCatalogPI = new Boolean(queryAllowOasisXMLCatalogPI()); + } + return this.oasisXMLCatalogPI.booleanValue(); + } + + public void setAllowOasisXMLCatalogPI(boolean allowPI) + { + this.oasisXMLCatalogPI = new Boolean(allowPI); + } + + /** + * @deprecated + */ + public boolean allowOasisXMLCatalogPI() + { + return getAllowOasisXMLCatalogPI(); + } + + public String queryCatalogClassName() + { + String className = System.getProperty(pClassname); + if (className == null) + { + if (this.resources == null) { + readProperties(); + } + if (this.resources == null) { + return null; + } + try + { + return this.resources.getString("catalog-class-name"); + } + catch (MissingResourceException e) + { + return null; + } + } + return className; + } + + public String getCatalogClassName() + { + if (this.catalogClassName == null) { + this.catalogClassName = queryCatalogClassName(); + } + return this.catalogClassName; + } + + public void setCatalogClassName(String className) + { + this.catalogClassName = className; + } + + /** + * @deprecated + */ + public String catalogClassName() + { + return getCatalogClassName(); + } +} diff --git a/o.apache.xml.resolver/patch-src/org/apache/xml/resolver/tools/NbCatalogResolver.java b/o.apache.xml.resolver/patch-src/org/apache/xml/resolver/tools/NbCatalogResolver.java new file mode 100644 index 000000000..8a2375e56 --- /dev/null +++ b/o.apache.xml.resolver/patch-src/org/apache/xml/resolver/tools/NbCatalogResolver.java @@ -0,0 +1,233 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.xml.resolver.tools; + +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.parsers.SAXParser; +import javax.xml.parsers.SAXParserFactory; +import javax.xml.transform.Source; +import javax.xml.transform.TransformerException; +import javax.xml.transform.URIResolver; +import javax.xml.transform.sax.SAXSource; +import org.apache.xml.resolver.Catalog; +import org.apache.xml.resolver.CatalogManager; +import org.apache.xml.resolver.NbCatalogManager; +import org.apache.xml.resolver.helpers.Debug; +import org.apache.xml.resolver.helpers.FileURL; +import org.xml.sax.EntityResolver; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; +import org.xml.sax.XMLReader; + +public class NbCatalogResolver + implements EntityResolver, URIResolver +{ + public boolean namespaceAware = true; + public boolean validating = false; + private Catalog catalog = null; + private CatalogManager catalogManager = NbCatalogManager.getStaticManager(); + + public NbCatalogResolver() + { + initializeCatalogs(false); + } + + public NbCatalogResolver(boolean privateCatalog) + { + initializeCatalogs(privateCatalog); + } + + public NbCatalogResolver(NbCatalogManager manager) + { + this.catalogManager = manager; + initializeCatalogs(!this.catalogManager.getUseStaticCatalog()); + } + + private void initializeCatalogs(boolean privateCatalog) + { + this.catalog = this.catalogManager.getCatalog(); + } + + public Catalog getCatalog() + { + return this.catalog; + } + + public String getResolvedEntity(String publicId, String systemId) + { + String resolved = null; + if (this.catalog == null) + { + this.catalogManager.debug.message(1, "Catalog resolution attempted with null catalog; ignored"); + return null; + } + if (systemId != null) { + try + { + resolved = this.catalog.resolveSystem(systemId); + } + catch (MalformedURLException me) + { + this.catalogManager.debug.message(1, "Malformed URL exception trying to resolve", publicId); + + resolved = null; + } + catch (IOException ie) + { + this.catalogManager.debug.message(1, "I/O exception trying to resolve", publicId); + resolved = null; + } + } + if (resolved == null) + { + if (publicId != null) { + try + { + resolved = this.catalog.resolvePublic(publicId, systemId); + } + catch (MalformedURLException me) + { + this.catalogManager.debug.message(1, "Malformed URL exception trying to resolve", publicId); + } + catch (IOException ie) + { + this.catalogManager.debug.message(1, "I/O exception trying to resolve", publicId); + } + } + if (resolved != null) { + this.catalogManager.debug.message(2, "Resolved public", publicId, resolved); + } + } + else + { + this.catalogManager.debug.message(2, "Resolved system", systemId, resolved); + } + return resolved; + } + + public InputSource resolveEntity(String publicId, String systemId) + { + String resolved = getResolvedEntity(publicId, systemId); + if (resolved != null) + { + InputSource iSource = new InputSource(resolved); + iSource.setPublicId(publicId); + return iSource; + } + return null; + } + + public Source resolve(String href, String base) + throws TransformerException + { + String uri = href; + String fragment = null; + int hashPos = href.indexOf("#"); + if (hashPos >= 0) + { + uri = href.substring(0, hashPos); + fragment = href.substring(hashPos + 1); + } + String result = null; + try + { + result = this.catalog.resolveURI(href); + } + catch (Exception e) {} + if (result == null) { + try + { + URL url = null; + if (base == null) + { + url = new URL(uri); + result = url.toString(); + } + else + { + URL baseURL = new URL(base); + url = href.length() == 0 ? baseURL : new URL(baseURL, uri); + result = url.toString(); + } + } + catch (MalformedURLException mue) + { + String absBase = makeAbsolute(base); + if (!absBase.equals(base)) { + return resolve(href, absBase); + } + throw new TransformerException("Malformed URL " + href + "(base " + base + ")", mue); + } + } + this.catalogManager.debug.message(2, "Resolved URI", href, result); + + SAXSource source = new SAXSource(); + source.setInputSource(new InputSource(result)); + setEntityResolver(source); + return source; + } + + private void setEntityResolver(SAXSource source) + throws TransformerException + { + XMLReader reader = source.getXMLReader(); + if (reader == null) + { + SAXParserFactory spFactory = SAXParserFactory.newInstance(); + spFactory.setNamespaceAware(true); + try + { + reader = spFactory.newSAXParser().getXMLReader(); + } + catch (ParserConfigurationException ex) + { + throw new TransformerException(ex); + } + catch (SAXException ex) + { + throw new TransformerException(ex); + } + } + reader.setEntityResolver(this); + source.setXMLReader(reader); + } + + private String makeAbsolute(String uri) + { + if (uri == null) { + uri = ""; + } + try + { + URL url = new URL(uri); + return url.toString(); + } + catch (MalformedURLException mue) + { + try + { + URL fileURL = FileURL.makeURL(uri); + return fileURL.toString(); + } + catch (MalformedURLException mue2) {} + } + return uri; + } +} ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          607. matthiasblaesing commented on issue #181: [NETBEANS-54] Module Review libs.osgi (followup) URL: https://github.com/apache/incubator-netbeans/pull/181#issuecomment-339720611 @geertjanw did find some time to have a look at this? ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          608. javydreamercsw commented on issue #163: [NETBEANS-54] Module Review maven.indexer URL: https://github.com/apache/incubator-netbeans/pull/163#issuecomment-339760312 In all my GitHub projects I can configure how PR are handled. From allowing all types (merge, squash, etc.) to selecting one or some of them. If squashing is the preferred way it should be probably the only option. Usually the person(s) configured to merge to trunk can choose which one. ![image](https://user-images.githubusercontent.com/2817343/32070839-27439ce8-ba53-11e7-8b4b-0b97e2136695.png) ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          609. juneau001 commented on issue #117: [NETBEANS-54] Modeule Review j2ee.persistence URL: https://github.com/apache/incubator-netbeans/pull/117#issuecomment-339766476 @matthiasblaesing How are things looking now??? I performed the recommended changes in the order you had outlined. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          610. geertjanw commented on issue #181: [NETBEANS-54] Module Review libs.osgi (followup) URL: https://github.com/apache/incubator-netbeans/pull/181#issuecomment-339770763 No, haven't been able to yet, if you know how to resolve this and have a moment to do it, that might be fastest. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          611. matthiasblaesing commented on issue #117: [NETBEANS-54] Modeule Review j2ee.persistence URL: https://github.com/apache/incubator-netbeans/pull/117#issuecomment-339778858 @juneau001 thank you. The commits still look strange (looks as if you merged master, but did neither the squash, nor the rebase). I took the changes consolidated that and pushed it as: https://github.com/apache/incubator-netbeans/commit/7e6fdbd145e62b7e33156afa7ef2bf3524c93da7 That should take care of j2ee.persistence ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          612. matthiasblaesing closed pull request #117: [NETBEANS-54] Modeule Review j2ee.persistence URL: https://github.com/apache/incubator-netbeans/pull/117 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/.gitignore b/.gitignore index ab346fa8f..b034c3ebd 100644 --- a/.gitignore +++ b/.gitignore @@ -20,7 +20,6 @@ .DS_Store #the following should only be transient, until resolved more appropriately: -/applemenu/src/java/ /db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/parser/JavaCharStream.java /db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/parser/ParseException.java /db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/parser/SQLParser.java @@ -28,23 +27,18 @@ /db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/parser/SQLParserTokenManager.java /db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/parser/Token.java /db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/parser/TokenMgrError.java +/debugger.jpda.ui/test/qa-functional/data/debugTestProject/nbproject/private/ +/debugger.jpda.ui/test/qa-functional/data/debugTestProjectAnt/nbproject/private/ /hibernate/src/org/netbeans/modules/hibernate/resources/hibernate-configuration-3.0.dtd /hibernate/src/org/netbeans/modules/hibernate/resources/hibernate-mapping-3.0.dtd /hibernate/src/org/netbeans/modules/hibernate/resources/hibernate-reverse-engineering-3.0.dtd -/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/resources/orm_1_0.xsd -/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/resources/orm_2_0.xsd -/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/resources/orm_2_1.xsd -/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/resources/persistence_1_0.xsd -/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/resources/persistence_2_0.xsd -/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/resources/persistence_2_1.xsd /lib.profiler/release/lib/ /websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/jaxb/ /websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/oauth/ /websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wadl/ /websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wadl20061109.xsd /websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wadl200902.xsd -/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/XMLNamespace.xsd -/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/XMLSchema-instance.xsd -/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/XMLSchema.dtd -/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/XMLSchema.xsd -/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/datatypes.dtd +/xml/test/qa-functional/data/DTDActionsTestProject/nbproject/private/ +/xml/test/qa-functional/data/ActionsTestProject/nbproject/private/ +/xml/test/qa-functional/data/CoreTemplatesTestProject/nbproject/private/ +/javafx2.samples/FXML-LoginDemo/nbproject/private/ diff --git a/ant.freeform/test/unit/data/example-projects/extbuildroot/proj/nbproject/project.xml b/ant.freeform/test/unit/data/example-projects/extbuildroot/proj/nbproject/project.xml index ba6e351e2..edba41401 100644 --- a/ant.freeform/test/unit/data/example-projects/extbuildroot/proj/nbproject/project.xml +++ b/ant.freeform/test/unit/data/example-projects/extbuildroot/proj/nbproject/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.ant.freeform</type> <configuration> diff --git a/ant.freeform/test/unit/data/example-projects/extbuildscript/nbproject/project.xml b/ant.freeform/test/unit/data/example-projects/extbuildscript/nbproject/project.xml index 94bcbef79..20b9d1aab 100644 --- a/ant.freeform/test/unit/data/example-projects/extbuildscript/nbproject/project.xml +++ b/ant.freeform/test/unit/data/example-projects/extbuildscript/nbproject/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.ant.freeform</type> <configuration> diff --git a/ant.freeform/test/unit/data/example-projects/extbuildscript/scripts/build.xml b/ant.freeform/test/unit/data/example-projects/extbuildscript/scripts/build.xml index b856805fc..664237736 100644 --- a/ant.freeform/test/unit/data/example-projects/extbuildscript/scripts/build.xml +++ b/ant.freeform/test/unit/data/example-projects/extbuildscript/scripts/build.xml @@ -1,3 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project name="extbuildscript" default="default" basedir="."> </project> diff --git a/ant.freeform/test/unit/data/example-projects/extsrcroot/proj/nbproject/project.xml b/ant.freeform/test/unit/data/example-projects/extsrcroot/proj/nbproject/project.xml index b90e5933b..19cd8d2ff 100644 --- a/ant.freeform/test/unit/data/example-projects/extsrcroot/proj/nbproject/project.xml +++ b/ant.freeform/test/unit/data/example-projects/extsrcroot/proj/nbproject/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.ant.freeform</type> <configuration> diff --git a/ant.freeform/test/unit/data/example-projects/freeforminside/FreeForm/build.xml b/ant.freeform/test/unit/data/example-projects/freeforminside/FreeForm/build.xml index 6273e82e2..14c1f169e 100644 --- a/ant.freeform/test/unit/data/example-projects/freeforminside/FreeForm/build.xml +++ b/ant.freeform/test/unit/data/example-projects/freeforminside/FreeForm/build.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project basedir="." default="dist" name="simple-freeform-project"> <target name="dist" /> </project> diff --git a/ant.freeform/test/unit/data/example-projects/freeforminside/build.xml b/ant.freeform/test/unit/data/example-projects/freeforminside/build.xml index 6273e82e2..14c1f169e 100644 --- a/ant.freeform/test/unit/data/example-projects/freeforminside/build.xml +++ b/ant.freeform/test/unit/data/example-projects/freeforminside/build.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project basedir="." default="dist" name="simple-freeform-project"> <target name="dist" /> </project> diff --git a/ant.freeform/test/unit/data/example-projects/freeforminside/nbproject/project.xml b/ant.freeform/test/unit/data/example-projects/freeforminside/nbproject/project.xml index 9b41d8922..c96e527fb 100644 --- a/ant.freeform/test/unit/data/example-projects/freeforminside/nbproject/project.xml +++ b/ant.freeform/test/unit/data/example-projects/freeforminside/nbproject/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.ant.freeform</type> <configuration> diff --git a/ant.freeform/test/unit/data/example-projects/simple/build.xml b/ant.freeform/test/unit/data/example-projects/simple/build.xml index 6134d228b..77e118141 100644 --- a/ant.freeform/test/unit/data/example-projects/simple/build.xml +++ b/ant.freeform/test/unit/data/example-projects/simple/build.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project basedir="." default="dist" name="simple-freeform-project"> <target name="init"> <property file="build.properties"/> diff --git a/ant.freeform/test/unit/data/example-projects/simple/nbproject/project.xml b/ant.freeform/test/unit/data/example-projects/simple/nbproject/project.xml index 4fdae3cb6..9cd8f0342 100644 --- a/ant.freeform/test/unit/data/example-projects/simple/nbproject/project.xml +++ b/ant.freeform/test/unit/data/example-projects/simple/nbproject/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.ant.freeform</type> <configuration> diff --git a/ant.freeform/test/unit/data/example-projects/simple2/nbproject/project.xml b/ant.freeform/test/unit/data/example-projects/simple2/nbproject/project.xml index 9cd05aecb..3702dfbf8 100644 --- a/ant.freeform/test/unit/data/example-projects/simple2/nbproject/project.xml +++ b/ant.freeform/test/unit/data/example-projects/simple2/nbproject/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.ant.freeform</type> <configuration> diff --git a/ant.freeform/test/unit/data/example-projects/simple3/build.xml b/ant.freeform/test/unit/data/example-projects/simple3/build.xml index 6273e82e2..14c1f169e 100644 --- a/ant.freeform/test/unit/data/example-projects/simple3/build.xml +++ b/ant.freeform/test/unit/data/example-projects/simple3/build.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project basedir="." default="dist" name="simple-freeform-project"> <target name="dist" /> </project> diff --git a/ant.freeform/test/unit/data/example-projects/simplewithlicense/build.xml b/ant.freeform/test/unit/data/example-projects/simplewithlicense/build.xml index 8c3b6f0bb..df056ac77 100644 --- a/ant.freeform/test/unit/data/example-projects/simplewithlicense/build.xml +++ b/ant.freeform/test/unit/data/example-projects/simplewithlicense/build.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project basedir="." default="all" name="simplewithlicense"> diff --git a/ant.freeform/test/unit/data/example-projects/simplewithlicense/nbproject/project.xml b/ant.freeform/test/unit/data/example-projects/simplewithlicense/nbproject/project.xml index e622f3a6a..d8958adb5 100644 --- a/ant.freeform/test/unit/data/example-projects/simplewithlicense/nbproject/project.xml +++ b/ant.freeform/test/unit/data/example-projects/simplewithlicense/nbproject/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.ant.freeform</type> <configuration> diff --git a/ant.freeform/test/unit/data/example-projects/web_jakarta/nbproject/project.xml b/ant.freeform/test/unit/data/example-projects/web_jakarta/nbproject/project.xml index 2c100453b..adebcf42c 100644 --- a/ant.freeform/test/unit/data/example-projects/web_jakarta/nbproject/project.xml +++ b/ant.freeform/test/unit/data/example-projects/web_jakarta/nbproject/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.ant.freeform</type> <configuration> diff --git a/ant.freeform/test/unit/src/META-INF/services/org.netbeans.spi.queries.CollocationQueryImplementation b/ant.freeform/test/unit/src/META-INF/services/org.netbeans.spi.queries.CollocationQueryImplementation index 6959cbf07..d327de214 100644 --- a/ant.freeform/test/unit/src/META-INF/services/org.netbeans.spi.queries.CollocationQueryImplementation +++ b/ant.freeform/test/unit/src/META-INF/services/org.netbeans.spi.queries.CollocationQueryImplementation @@ -1 +1,18 @@ -#-org.netbeans.modules.queries.AlwaysRelativeCollocationQuery +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#-org.netbeans.modules.queries.AlwaysRelativeCollocationQuery \ No newline at end of file diff --git a/api.annotations.common/apichanges.xml b/api.annotations.common/apichanges.xml index 3d6755fd7..4ac0a1f86 100644 --- a/api.annotations.common/apichanges.xml +++ b/api.annotations.common/apichanges.xml @@ -1,48 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Search for CHANGEME in this document when copying and using it: --> <!-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. - -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. - - -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" - -Contributor(s): - -The Original Software is NetBeans. The Initial Developer of the Original -Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun -Microsystems, Inc. All Rights Reserved. - -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + --> <?xml-stylesheet type="text/xml" href="CHANGEME/nbbuild/javadoctools/apichanges.xsl"?> <!DOCTYPE apichanges PUBLIC "-//NetBeans//DTD API changes list 1.0//EN" "../nbbuild/javadoctools/apichanges.dtd"> diff --git a/api.annotations.common/external/binaries-list b/api.annotations.common/external/binaries-list index 8298f8fc5..74f1e377c 100644 --- a/api.annotations.common/external/binaries-list +++ b/api.annotations.common/external/binaries-list @@ -14,4 +14,4 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -5871FB60DC68D67DA54A663C3FD636A10A532948 jsr305.jar +516C03B21D50A644D538DE0F0369C620989CD8F0 com.google.code.findbugs:jsr305:2.0.0 \ No newline at end of file diff --git a/api.annotations.common/external/jsr305-2.0.0-license.txt b/api.annotations.common/external/jsr305-2.0.0-license.txt new file mode 100644 index 000000000..53b4a1b25 --- /dev/null +++ b/api.annotations.common/external/jsr305-2.0.0-license.txt @@ -0,0 +1,42 @@ +Name: jsr305-2.0.0.jar +Version: 2.0.0 +Description: JSR305 Annotations for Findbugs +License: BSD +OSR: N/A +Origin: http://central.maven.org/maven2/com/google/code/findbugs/jsr305/2.0.0/jsr305-2.0.0.jar +Comment: Use of JSR 305 is governed by the terms of the license below: +Comment: The JSR-305 reference implementation (lib/jsr305.jar) is distributed +Comment: under the terms of the New BSD license: +Comment: https://opensource.org/licenses/BSD-3-Clause +Comment: See the JSR-305 home page for more information: +Comment: http://code.google.com/p/jsr-305/ + + +Copyright (c) __YEAR__, __OWNER__ + +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +3. Neither the name of __COPYRIGHT_OWNER__ nor the names + of __PRONOUN__ contributors may be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. + diff --git a/api.annotations.common/external/jsr305-2.0.0-notice.txt b/api.annotations.common/external/jsr305-2.0.0-notice.txt new file mode 100644 index 000000000..a91912ef1 --- /dev/null +++ b/api.annotations.common/external/jsr305-2.0.0-notice.txt @@ -0,0 +1,5 @@ +The Java code in the package javax.annotation.concurrent in jsr305-2.0.0.jar +is copyright (c) 2005 Brian Goetz and is released under the Creative Commons +Attribution License (http://creativecommons.org/licenses/by/2.5) + +Official home: http://www.jcip.net \ No newline at end of file diff --git a/api.annotations.common/external/jsr305-license.txt b/api.annotations.common/external/jsr305-license.txt deleted file mode 100644 index 6d8929c26..000000000 --- a/api.annotations.common/external/jsr305-license.txt +++ /dev/null @@ -1,15 +0,0 @@ -Name: JSR305 -License: New BSD -Origin: http://repo1.maven.org/maven2/com/google/code/findbugs/jsr305/2.0.0/jsr305-2.0.0.jar - -Use of JSR 305 is governed by the terms of the license below: - -[TEXT OF THE LICENSE] -The JSR-305 reference implementation (lib/jsr305.jar) is -distributed under the terms of the New BSD license: - - http://www.opensource.org/licenses/bsd-license.php - -See the JSR-305 home page for more information: - - http://code.google.com/p/jsr-305/ diff --git a/api.annotations.common/nbproject/project.properties b/api.annotations.common/nbproject/project.properties index e17605cf1..9ff142e7b 100644 --- a/api.annotations.common/nbproject/project.properties +++ b/api.annotations.common/nbproject/project.properties @@ -22,4 +22,4 @@ javac.compilerargs=-Xlint -Xlint:-serial javadoc.arch=${basedir}/arch.xml javadoc.apichanges=${basedir}/apichanges.xml -cp.extra=external/jsr305.jar +cp.extra=external/jsr305-2.0.0.jar diff --git a/api.annotations.common/src/META-INF/services/javax.annotation.processing.Processor b/api.annotations.common/src/META-INF/services/javax.annotation.processing.Processor index bac1ed29e..1a17a0264 100644 --- a/api.annotations.common/src/META-INF/services/javax.annotation.processing.Processor +++ b/api.annotations.common/src/META-INF/services/javax.annotation.processing.Processor @@ -1,42 +1,18 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. +# http://www.apache.org/licenses/LICENSE-2.0 # -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. # -# Contributor(s): -# -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. org.netbeans.api.annotations.common.proc.StaticResourceProcessor diff --git a/apisupport.ant/l10n.list b/apisupport.ant/l10n.list index 223506330..d6e1cd86c 100644 --- a/apisupport.ant/l10n.list +++ b/apisupport.ant/l10n.list @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# # apisupport/ant read global ${l10n-module}/src/**/TemplateNames.properties diff --git a/apisupport.project/l10n.list b/apisupport.project/l10n.list index 7e470db6c..7f5ed19ee 100644 --- a/apisupport.project/l10n.list +++ b/apisupport.project/l10n.list @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# # apisupport/project read global ${l10n-module}/src/org/netbeans/modules/apisupport/project/metainf/*.png diff --git a/apisupport.refactoring/test/qa-functional/data/testRename/src/META-INF/services/org.openide.loaders.UniFileLoader b/apisupport.refactoring/test/qa-functional/data/testRename/src/META-INF/services/org.openide.loaders.UniFileLoader index 7bf40951e..0bdc45162 100644 --- a/apisupport.refactoring/test/qa-functional/data/testRename/src/META-INF/services/org.openide.loaders.UniFileLoader +++ b/apisupport.refactoring/test/qa-functional/data/testRename/src/META-INF/services/org.openide.loaders.UniFileLoader @@ -1 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# testRename.MyDataLoader diff --git a/apisupport.refactoring/test/qa-functional/data/testRename/src/META-INF/services/org.openide.util.actions.CookieAction b/apisupport.refactoring/test/qa-functional/data/testRename/src/META-INF/services/org.openide.util.actions.CookieAction index b04a9cdef..661ef22ae 100644 --- a/apisupport.refactoring/test/qa-functional/data/testRename/src/META-INF/services/org.openide.util.actions.CookieAction +++ b/apisupport.refactoring/test/qa-functional/data/testRename/src/META-INF/services/org.openide.util.actions.CookieAction @@ -1 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# testRename.WhereUsedAction \ No newline at end of file diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/actionListener.javx b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/actionListener.javx index 3e05e9603..e93c5039d 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/actionListener.javx +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/actionListener.javx @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/callableSystemAction.javx b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/callableSystemAction.javx index 8899d4f98..e4210beff 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/callableSystemAction.javx +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/callableSystemAction.javx @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/contextAction.javx b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/contextAction.javx index 53f4fa31a..2811ef3a9 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/contextAction.javx +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/contextAction.javx @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/cookieAction.javx b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/cookieAction.javx index 1e0d4556e..341dff2d6 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/cookieAction.javx +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/cookieAction.javx @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/codegenerator/Bundle.properties b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/codegenerator/Bundle.properties index 66f16f7fb..f8e8e34d0 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/codegenerator/Bundle.properties +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/codegenerator/Bundle.properties @@ -1,42 +1,19 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -# Copyright 2010 Oracle and/or its affiliates. All rights reserved. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. - -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" - -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. - -# Contributor(s): - -# Portions Copyrighted 2008 Sun Microsystems, Inc. +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. LBL_CodeGeneratorPanel_Title=Code Generator Templates/NetBeansModuleDevelopment/newCodeGenerator=Code Generator diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/codegenerator/codeGenerator.javx b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/codegenerator/codeGenerator.javx index 8634cf86f..1c8458cc8 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/codegenerator/codeGenerator.javx +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/codegenerator/codeGenerator.javx @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/codegenerator/contextProvider.javx b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/codegenerator/contextProvider.javx index 349655ea6..78a3edbe0 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/codegenerator/contextProvider.javx +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/codegenerator/contextProvider.javx @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/html/HTML.htmx b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/html/HTML.htmx index 0d91bd89f..a2264a933 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/html/HTML.htmx +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/html/HTML.htmx @@ -1,3 +1,23 @@ +<#-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html> <head> <title>${TEMPLATENAME}</title> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/html/HTML.javx b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/html/HTML.javx index 13e003704..854c9a6fc 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/html/HTML.javx +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/html/HTML.javx @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin-about.html b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin-about.html index de5201749..7fa438e94 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin-about.html +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin-about.html @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "<!--"> <#assign licensePrefix = ""> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin-helpset.xml b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin-helpset.xml index 3089876f1..85fdbaf6a 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin-helpset.xml +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin-helpset.xml @@ -1,42 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "<!--"> <#assign licensePrefix = ""> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin-idx.xml b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin-idx.xml index efe8a4091..977129a74 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin-idx.xml +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin-idx.xml @@ -1,42 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "<!--"> <#assign licensePrefix = ""> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin-map.jhm b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin-map.jhm index 10d94d11b..f93cc7ef3 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin-map.jhm +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin-map.jhm @@ -1,42 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "<!--"> <#assign licensePrefix = ""> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin-toc.xml b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin-toc.xml index 998a16e86..9ba5d480b 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin-toc.xml +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin-toc.xml @@ -1,42 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "<!--"> <#assign licensePrefix = ""> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin.hs b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin.hs index e4574ba72..58082860b 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin.hs +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin.hs @@ -1,42 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "<!--"> <#assign licensePrefix = ""> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/javaHint.javx b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/javaHint.javx index 9df06e12c..adc0faafe 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/javaHint.javx +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/javaHint.javx @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/javaHintTest.javx b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/javaHintTest.javx index b09b6cca4..066c61c61 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/javaHintTest.javx +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/javaHintTest.javx @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/javaHintTestApp.javx b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/javaHintTestApp.javx index ffcf6168f..d0314a366 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/javaHintTestApp.javx +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/javahint/javaHintTestApp.javx @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/librarydescriptor/libdescriptemplate.xml b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/librarydescriptor/libdescriptemplate.xml index ca61acb07..4620de268 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/librarydescriptor/libdescriptemplate.xml +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/librarydescriptor/libdescriptemplate.xml @@ -1,42 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "<!--"> <#assign licensePrefix = ""> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataLoader.javx b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataLoader.javx index 51b01f9ea..6c1b11f75 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataLoader.javx +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataLoader.javx @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataLoaderBeanInfo.javx b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataLoaderBeanInfo.javx index c8664870f..ad91b52b3 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataLoaderBeanInfo.javx +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataLoaderBeanInfo.javx @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataNode.javx b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataNode.javx index b72960c02..75133d759 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataNode.javx +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataNode.javx @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObject.javx b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObject.javx index 26caa2b91..6d97d8d1d 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObject.javx +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObject.javx @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObjectAnno.javx b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObjectAnno.javx index 13f682609..eb8e69711 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObjectAnno.javx +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObjectAnno.javx @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObjectInLayer.javx b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObjectInLayer.javx index 0dc6e0659..498b931a4 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObjectInLayer.javx +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObjectInLayer.javx @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObjectMulti.javx b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObjectMulti.javx index bc148c6a5..54ca2c5b2 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObjectMulti.javx +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObjectMulti.javx @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObjectMultiVisual.forx b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObjectMultiVisual.forx index 761bb54e6..cc30159e0 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObjectMultiVisual.forx +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObjectMultiVisual.forx @@ -1,5 +1,24 @@ <?xml version="1.0" encoding="UTF-8" ?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <Form version="1.3" type="org.netbeans.modules.form.forminfo.JPanelFormInfo"> <AuxValues> <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObjectMultiVisual.javx b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObjectMultiVisual.javx index 8c5085d0b..2a900c824 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObjectMultiVisual.javx +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObjectMultiVisual.javx @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. - -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. - -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" - -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + --> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObjectWithLookup.javx b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObjectWithLookup.javx index 1f10806f2..b150f1b54 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObjectWithLookup.javx +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateDataObjectWithLookup.javx @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateNew1 b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateNew1 index 0d6f364b7..804fa30ff 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateNew1 +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateNew1 @@ -1 +1,21 @@ +<#-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> sample content \ No newline at end of file diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateNew2 b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateNew2 index 52bd0abf9..ca12cf787 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateNew2 +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateNew2 @@ -1,2 +1,22 @@ +<#-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <root xmlns="${NAMESPACE}"> </root> \ No newline at end of file diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateresolver.xml b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateresolver.xml index ea9ca7b98..60dc41db4 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateresolver.xml +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/loader/templateresolver.xml @@ -1,42 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "<!--"> <#assign licensePrefix = ""> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/moduleinstall/moduleActivator.javx b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/moduleinstall/moduleActivator.javx index eb29620bc..2be6ebec4 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/moduleinstall/moduleActivator.javx +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/moduleinstall/moduleActivator.javx @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. - -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. - -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" - -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + --> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/moduleinstall/moduleInstall.javx b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/moduleinstall/moduleInstall.javx index c820fe511..20ea61a5e 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/moduleinstall/moduleInstall.javx +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/moduleinstall/moduleInstall.javx @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. - -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. - -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" - -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + --> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/template_mypluginOptionsPanelController b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/template_mypluginOptionsPanelController index ff6b9dc0a..6cee21ed9 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/template_mypluginOptionsPanelController +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/template_mypluginOptionsPanelController @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. - -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. - -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" - -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + --> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/template_mypluginPanel b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/template_mypluginPanel index 207e34e9b..6d33469d1 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/template_mypluginPanel +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/template_mypluginPanel @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/template_myplugin_formPanel b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/template_myplugin_formPanel index 358ae7280..0a26af4cd 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/template_myplugin_formPanel +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/options/template_myplugin_formPanel @@ -1,5 +1,24 @@ <?xml version="1.0" encoding="UTF-8" ?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <Form version="1.3" type="org.netbeans.modules.form.forminfo.JPanelFormInfo"> <Properties> </Properties> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/templateDescription.html b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/templateDescription.html index a82633025..8c7f01ce1 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/templateDescription.html +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/templateDescription.html @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "<!--"> <#assign licensePrefix = ""> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/templatePanelVisual.frmx b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/templatePanelVisual.frmx index ddc424bbf..b44c0c682 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/templatePanelVisual.frmx +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/templatePanelVisual.frmx @@ -1,5 +1,24 @@ <?xml version="1.0" encoding="UTF-8" ?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <Form version="1.3" type="org.netbeans.modules.form.forminfo.JPanelFormInfo"> <AuxValues> <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/templatePanelVisual.javx b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/templatePanelVisual.javx index 316f0968d..e32f5508d 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/templatePanelVisual.javx +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/templatePanelVisual.javx @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. - -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. - -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" - -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + --> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/templateWizardIterator.javx b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/templateWizardIterator.javx index 05d47ad67..3056d7377 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/templateWizardIterator.javx +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/templateWizardIterator.javx @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/templateWizardPanel.javx b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/templateWizardPanel.javx index 923337aeb..af83b9a01 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/templateWizardPanel.javx +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/templateWizardPanel.javx @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. - -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. - -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" - -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + --> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/quicksearch/quickSearch.javx b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/quicksearch/quickSearch.javx index d14baf96b..5ab08a285 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/quicksearch/quickSearch.javx +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/quicksearch/quickSearch.javx @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/updatecenter/update_center.xml b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/updatecenter/update_center.xml index 510a58c3f..ffe1e6be2 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/updatecenter/update_center.xml +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/updatecenter/update_center.xml @@ -1,42 +1,23 @@ <?xml version="1.0"?> <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "<!--"> <#assign licensePrefix = ""> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateAction.javx b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateAction.javx index b56be3c41..67533abe2 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateAction.javx +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateAction.javx @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateSettings.xml b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateSettings.xml index 5f0f155e3..3f5a9d23f 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateSettings.xml +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateSettings.xml @@ -1,42 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "<!--"> <#assign licensePrefix = ""> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateTopComponent.frmx b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateTopComponent.frmx index 761bb54e6..cc30159e0 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateTopComponent.frmx +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateTopComponent.frmx @@ -1,5 +1,24 @@ <?xml version="1.0" encoding="UTF-8" ?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <Form version="1.3" type="org.netbeans.modules.form.forminfo.JPanelFormInfo"> <AuxValues> <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateTopComponent.javx b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateTopComponent.javx index 77a941ccd..26aaa20d1 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateTopComponent.javx +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateTopComponent.javx @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. - -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. - -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" - -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + --> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateTopComponent637.javx b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateTopComponent637.javx index 4c0b88847..83e54a0d3 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateTopComponent637.javx +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateTopComponent637.javx @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateTopComponentAnno.javx b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateTopComponentAnno.javx index 5cf0607b0..7b7a725fc 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateTopComponentAnno.javx +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateTopComponentAnno.javx @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. - -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. - -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" - -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + --> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateWstcref.xml b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateWstcref.xml index 8ff8ae080..fa083045e 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateWstcref.xml +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/templateWstcref.xml @@ -1,42 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "<!--"> <#assign licensePrefix = ""> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/instantiatingIterator.javx b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/instantiatingIterator.javx index 2deac0f1f..a7426ed23 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/instantiatingIterator.javx +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/instantiatingIterator.javx @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. - -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. - -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" - -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + --> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/sampleAction.javx b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/sampleAction.javx index 1f357091c..be6676f85 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/sampleAction.javx +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/sampleAction.javx @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/visualPanel.forx b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/visualPanel.forx index 761bb54e6..cc30159e0 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/visualPanel.forx +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/visualPanel.forx @@ -1,5 +1,24 @@ <?xml version="1.0" encoding="UTF-8" ?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <Form version="1.3" type="org.netbeans.modules.form.forminfo.JPanelFormInfo"> <AuxValues> <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/visualPanel.javx b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/visualPanel.javx index 43bf23072..e6b554b4a 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/visualPanel.javx +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/visualPanel.javx @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardDescription.html b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardDescription.html index a4d0abacb..a3b6c7b15 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardDescription.html +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardDescription.html @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "<!--"> <#assign licensePrefix = ""> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardHTML.fmk b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardHTML.fmk index d3fd2a978..29b33ee77 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardHTML.fmk +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardHTML.fmk @@ -1 +1,21 @@ +<#-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> You are feeling ${"$"}{wizard.msg}! diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardHTML.html b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardHTML.html index 5193eabce..1c1c49fe6 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardHTML.html +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardHTML.html @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "<!--"> <#assign licensePrefix = ""> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardHTML.javx b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardHTML.javx index 36315a7c0..a15fd627e 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardHTML.javx +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardHTML.javx @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardIterator.javx b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardIterator.javx index 58ce93356..12304801d 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardIterator.javx +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardIterator.javx @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. - -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. - -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" - -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + --> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> diff --git a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardPanel.javx b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardPanel.javx index ff463e79d..f741796a3 100644 --- a/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardPanel.javx +++ b/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardPanel.javx @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> diff --git a/apisupport.wizards/test/unit/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/testWsmode.xml b/apisupport.wizards/test/unit/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/testWsmode.xml index 8cb18e9ce..07954d9b6 100644 --- a/apisupport.wizards/test/unit/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/testWsmode.xml +++ b/apisupport.wizards/test/unit/src/org/netbeans/modules/apisupport/project/ui/wizard/winsys/testWsmode.xml @@ -1,5 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <mode version="2.4"> <name unique="nadexplorer" /> <kind type="view" /> diff --git a/applemenu/build.xml b/applemenu/build.xml index 7c75eb1ff..33a14cc15 100644 --- a/applemenu/build.xml +++ b/applemenu/build.xml @@ -23,36 +23,11 @@ <project name="applemenu" basedir="." default="netbeans"> <import file="../nbbuild/templates/projectized.xml"/> -<property name="jdk-version" value="${ant.java.version}"/> -<property name="jdk-9-version" value="1.9"/> - <property name="applemenu.src.dir" value="./src/"/> - - <target name="compile" depends="projectized-common.compile"> - <delete dir="${build.classes.dir}/com"/> <!-- just stubs --> - <delete dir="${build.classes.dir}/java"/> <!-- just stubs --> - </target> - - - <target name="ext-desktop-classes-unzip-cond"> - <script language="javascript"><![CDATA[ - - var jdkCurrentVersion = parseFloat(project.getProperty('jdk-version')); - var jdk9Version = parseFloat(project.getProperty('jdk-9-version')); - - project.setProperty('isJdkVersionLessth9', jdkCurrentVersion < jdk9Version ); - ]]></script> - - <condition property="isJdkVersionLessth9"> - <equals arg1="${isJdkVersionLessth9}" arg2="true"/> - </condition> - </target> - - <target name="unzip-ext-binaries" depends="ext-desktop-classes-unzip-cond" if="${isJdkVersionLessth9}"> - <echo>Get file based on condition being false</echo> - </target> - - <target name="build-init" depends="ext-desktop-classes-unzip-cond,projectized.build-init" if="${isJdkVersionLessth9}"> - <unzip src="external/applemenu-external-desktop-classes.zip" dest="${applemenu.src.dir}"/> + <target name="build-init" depends="projectized.build-init"> + <mkdir dir="${build.dir}/desktop-classes-src" /> + <unzip src="external/applemenu-external-desktop-classes.zip" dest="${build.dir}/desktop-classes-src"/> + <mkdir dir="${build.dir}/desktop-classes-classes" /> + <javac srcdir="${build.dir}/desktop-classes-src" destdir="${build.dir}/desktop-classes-classes" /> </target> </project> diff --git a/applemenu/external/applemenu-external-desktop-classes-license.txt b/applemenu/external/applemenu-external-desktop-classes-license.txt new file mode 100644 index 000000000..119492fa4 --- /dev/null +++ b/applemenu/external/applemenu-external-desktop-classes-license.txt @@ -0,0 +1,832 @@ +Name: External Desktop Classes +Version: 8.2 +License: CDDL-GPL-2-CP +Origin: NetBeans +Comment: Provides java.awt.desktop classes to support compilation on JDK 8. + +COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 + +1. Definitions. + +1.1. "Contributor" means each individual or entity that +creates or contributes to the creation of Modifications. + +1.2. "Contributor Version" means the combination of the +Original Software, prior Modifications used by a +Contributor (if any), and the Modifications made by that +particular Contributor. + +1.3. "Covered Software" means (a) the Original Software, or +(b) Modifications, or (c) the combination of files +containing Original Software with files containing +Modifications, in each case including portions thereof. + +1.4. "Executable" means the Covered Software in any form +other than Source Code. + +1.5. "Initial Developer" means the individual or entity +that first makes Original Software available under this +License. + +1.6. "Larger Work" means a work which combines Covered +Software or portions thereof with code not governed by the +terms of this License. + +1.7. "License" means this document. + +1.8. "Licensable" means having the right to grant, to the +maximum extent possible, whether at the time of the initial +grant or subsequently acquired, any and all of the rights +conveyed herein. + +1.9. "Modifications" means the Source Code and Executable +form of any of the following: + +A. Any file that results from an addition to, +deletion from or modification of the contents of a +file containing Original Software or previous +Modifications; + +B. Any new file that contains any part of the +Original Software or previous Modification; or + +C. Any new file that is contributed or otherwise made +available under the terms of this License. + +1.10. "Original Software" means the Source Code and +Executable form of computer software code that is +originally released under this License. + +1.11. "Patent Claims" means any patent claim(s), now owned +or hereafter acquired, including without limitation, +method, process, and apparatus claims, in any patent +Licensable by grantor. + +1.12. "Source Code" means (a) the common form of computer +software code in which modifications are made and (b) +associated documentation included in or with such code. + +1.13. "You" (or "Your") means an individual or a legal +entity exercising rights under, and complying with all of +the terms of, this License. For legal entities, "You" +includes any entity which controls, is controlled by, or is +under common control with You. For purposes of this +definition, "control" means (a) the power, direct or +indirect, to cause the direction or management of such +entity, whether by contract or otherwise, or (b) ownership +of more than fifty percent (50%) of the outstanding shares +or beneficial ownership of such entity. + +2. License Grants. + +2.1. The Initial Developer Grant. + +Conditioned upon Your compliance with Section 3.1 below and +subject to third party intellectual property claims, the +Initial Developer hereby grants You a world-wide, +royalty-free, non-exclusive license: + +(a) under intellectual property rights (other than +patent or trademark) Licensable by Initial Developer, +to use, reproduce, modify, display, perform, +sublicense and distribute the Original Software (or +portions thereof), with or without Modifications, +and/or as part of a Larger Work; and + +(b) under Patent Claims infringed by the making, +using or selling of Original Software, to make, have +made, use, practice, sell, and offer for sale, and/or +otherwise dispose of the Original Software (or +portions thereof). + +(c) The licenses granted in Sections 2.1(a) and (b) +are effective on the date Initial Developer first +distributes or otherwise makes the Original Software +available to a third party under the terms of this +License. + +(d) Notwithstanding Section 2.1(b) above, no patent +license is granted: (1) for code that You delete from +the Original Software, or (2) for infringements +caused by: (i) the modification of the Original +Software, or (ii) the combination of the Original +Software with other software or devices. + +2.2. Contributor Grant. + +Conditioned upon Your compliance with Section 3.1 below and +subject to third party intellectual property claims, each +Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +(a) under intellectual property rights (other than +patent or trademark) Licensable by Contributor to +use, reproduce, modify, display, perform, sublicense +and distribute the Modifications created by such +Contributor (or portions thereof), either on an +unmodified basis, with other Modifications, as +Covered Software and/or as part of a Larger Work; and + +(b) under Patent Claims infringed by the making, +using, or selling of Modifications made by that +Contributor either alone and/or in combination with +its Contributor Version (or portions of such +combination), to make, use, sell, offer for sale, +have made, and/or otherwise dispose of: (1) +Modifications made by that Contributor (or portions +thereof); and (2) the combination of Modifications +made by that Contributor with its Contributor Version +(or portions of such combination). + +(c) The licenses granted in Sections 2.2(a) and +2.2(b) are effective on the date Contributor first +distributes or otherwise makes the Modifications +available to a third party. + +(d) Notwithstanding Section 2.2(b) above, no patent +license is granted: (1) for any code that Contributor +has deleted from the Contributor Version; (2) for +infringements caused by: (i) third party +modifications of Contributor Version, or (ii) the +combination of Modifications made by that Contributor +with other software (except as part of the +Contributor Version) or other devices; or (3) under +Patent Claims infringed by Covered Software in the +absence of Modifications made by that Contributor. + +3. Distribution Obligations. + +3.1. Availability of Source Code. + +Any Covered Software that You distribute or otherwise make +available in Executable form must also be made available in +Source Code form and that Source Code form must be +distributed only under the terms of this License. You must +include a copy of this License with every copy of the +Source Code form of the Covered Software You distribute or +otherwise make available. You must inform recipients of any +such Covered Software in Executable form as to how they can +obtain such Covered Software in Source Code form in a +reasonable manner on or through a medium customarily used +for software exchange. + +3.2. Modifications. + +The Modifications that You create or to which You +contribute are governed by the terms of this License. You +represent that You believe Your Modifications are Your +original creation(s) and/or You have sufficient rights to +grant the rights conveyed by this License. + +3.3. Required Notices. + +You must include a notice in each of Your Modifications +that identifies You as the Contributor of the Modification. +You may not remove or alter any copyright, patent or +trademark notices contained within the Covered Software, or +any notices of licensing or any descriptive text giving +attribution to any Contributor or the Initial Developer. + +3.4. Application of Additional Terms. + +You may not offer or impose any terms on any Covered +Software in Source Code form that alters or restricts the +applicable version of this License or the recipients' +rights hereunder. You may choose to offer, and to charge a +fee for, warranty, support, indemnity or liability +obligations to one or more recipients of Covered Software. +However, you may do so only on Your own behalf, and not on +behalf of the Initial Developer or any Contributor. You +must make it absolutely clear that any such warranty, +support, indemnity or liability obligation is offered by +You alone, and You hereby agree to indemnify the Initial +Developer and every Contributor for any liability incurred +by the Initial Developer or such Contributor as a result of +warranty, support, indemnity or liability terms You offer. + +3.5. Distribution of Executable Versions. + +You may distribute the Executable form of the Covered +Software under the terms of this License or under the terms +of a license of Your choice, which may contain terms +different from this License, provided that You are in +compliance with the terms of this License and that the +license for the Executable form does not attempt to limit +or alter the recipient's rights in the Source Code form +from the rights set forth in this License. If You +distribute the Covered Software in Executable form under a +different license, You must make it absolutely clear that +any terms which differ from this License are offered by You +alone, not by the Initial Developer or Contributor. You +hereby agree to indemnify the Initial Developer and every +Contributor for any liability incurred by the Initial +Developer or such Contributor as a result of any such terms +You offer. + +3.6. Larger Works. + +You may create a Larger Work by combining Covered Software +with other code not governed by the terms of this License +and distribute the Larger Work as a single product. In such +a case, You must make sure the requirements of this License +are fulfilled for the Covered Software. + +4. Versions of the License. + +4.1. New Versions. + +Sun Microsystems, Inc. is the initial license steward and +may publish revised and/or new versions of this License +from time to time. Each version will be given a +distinguishing version number. Except as provided in +Section 4.3, no one other than the license steward has the +right to modify this License. + +4.2. Effect of New Versions. + +You may always continue to use, distribute or otherwise +make the Covered Software available under the terms of the +version of the License under which You originally received +the Covered Software. If the Initial Developer includes a +notice in the Original Software prohibiting it from being +distributed or otherwise made available under any +subsequent version of the License, You must distribute and +make the Covered Software available under the terms of the +version of the License under which You originally received +the Covered Software. Otherwise, You may also choose to +use, distribute or otherwise make the Covered Software +available under the terms of any subsequent version of the +License published by the license steward. + +4.3. Modified Versions. + +When You are an Initial Developer and You want to create a +new license for Your Original Software, You may create and +use a modified version of this License if You: (a) rename +the license and remove any references to the name of the +license steward (except to note that the license differs +from this License); and (b) otherwise make it clear that +the license contains terms which differ from this License. + +5. DISCLAIMER OF WARRANTY. + +COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" +BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, +INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED +SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR +PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND +PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY +COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE +INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF +ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF +WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF +ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS +DISCLAIMER. + +6. TERMINATION. + +6.1. This License and the rights granted hereunder will +terminate automatically if You fail to comply with terms +herein and fail to cure such breach within 30 days of +becoming aware of the breach. Provisions which, by their +nature, must remain in effect beyond the termination of +this License shall survive. + +6.2. If You assert a patent infringement claim (excluding +declaratory judgment actions) against Initial Developer or +a Contributor (the Initial Developer or Contributor against +whom You assert such claim is referred to as "Participant") +alleging that the Participant Software (meaning the +Contributor Version where the Participant is a Contributor +or the Original Software where the Participant is the +Initial Developer) directly or indirectly infringes any +patent, then any and all rights granted directly or +indirectly to You by such Participant, the Initial +Developer (if the Initial Developer is not the Participant) +and all Contributors under Sections 2.1 and/or 2.2 of this +License shall, upon 60 days notice from Participant +terminate prospectively and automatically at the expiration +of such 60 day notice period, unless if within such 60 day +period You withdraw Your claim with respect to the +Participant Software against such Participant either +unilaterally or pursuant to a written agreement with +Participant. + +6.3. If You assert a patent infringement claim against +Participant alleging that the Participant Software directly +or indirectly infringes any patent where such claim is +resolved (such as by license or settlement) prior to the +initiation of patent infringement litigation, then the +reasonable value of the licenses granted by such Participant +under Sections 2.1 or 2.2 shall be taken into account in +determining the amount or value of any payment or license. + +6.4. In the event of termination under Sections 6.1 or 6.2 +above, all end user licenses that have been validly granted +by You or any distributor hereunder prior to termination +(excluding licenses granted to You by any distributor) +shall survive termination. + +7. LIMITATION OF LIABILITY. + +UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT +(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE +INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF +COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE +LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR +CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT +LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK +STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER +COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN +INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF +LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL +INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT +APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO +NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR +CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT +APPLY TO YOU. + +8. U.S. GOVERNMENT END USERS. + +The Covered Software is a "commercial item," as that term is +defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial +computer software" (as that term is defined at 48 C.F.R. +§ 252.227-7014(a)(1)) and "commercial computer software +documentation" as such terms are used in 48 C.F.R. 12.212 (Sept. +1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 +through 227.7202-4 (June 1995), all U.S. Government End Users +acquire Covered Software with only those rights set forth herein. +This U.S. Government Rights clause is in lieu of, and supersedes, +any other FAR, DFAR, or other clause or provision that addresses +Government rights in computer software under this License. + +9. MISCELLANEOUS. + +This License represents the complete agreement concerning subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the +extent necessary to make it enforceable. This License shall be +governed by the law of the jurisdiction specified in a notice +contained within the Original Software (except to the extent +applicable law, if any, provides otherwise), excluding such +jurisdiction's conflict-of-law provisions. Any litigation +relating to this License shall be subject to the jurisdiction of +the courts located in the jurisdiction and venue specified in a +notice contained within the Original Software, with the losing +party responsible for costs, including, without limitation, court +costs and reasonable attorneys' fees and expenses. The +application of the United Nations Convention on Contracts for the +International Sale of Goods is expressly excluded. Any law or +regulation which provides that the language of a contract shall +be construed against the drafter shall not apply to this License. +You agree that You alone are responsible for compliance with the +United States export administration regulations (and the export +control laws and regulation of any other countries) when You use, +distribute or otherwise make available any Covered Software. + +10. RESPONSIBILITY FOR CLAIMS. + +As between Initial Developer and the Contributors, each party is +responsible for claims and damages arising, directly or +indirectly, out of its utilization of rights under this License +and You agree to work with Initial Developer and Contributors to +distribute such responsibility on an equitable basis. Nothing +herein is intended or shall be deemed to constitute any admission +of liability. + +NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND +DISTRIBUTION LICENSE (CDDL) + +The code released under the CDDL shall be governed by the laws +of the State of California (excluding conflict-of-law provisions). +Any litigation relating to this License shall be subject to the +jurisdiction of the Federal Courts of the Northern District of +California and the state courts of the State of California, with +venue lying in Santa Clara County, California. + + +The GNU General Public License (GPL) +Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim + copies of this license document, but changing it is not + allowed. + + Preamble + +The licenses for most software are designed to take away +your freedom to share and change it. By contrast, the GNU +General Public License is intended to guarantee your freedom +to share and change free software--to make sure the software +is free for all its users. This General Public License +applies to most of the Free Software Foundation's software +and to any other program whose authors commit to using it. +(Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can +apply it to your programs, too. + +When we speak of free software, we are referring to freedom, +not price. Our General Public Licenses are designed to make +sure that you have the freedom to distribute copies of free +software (and charge for this service if you wish), that you +receive source code or can get it if you want it, that you +can change the software or use pieces of it in new free +programs; and that you know you can do these things. + +To protect your rights, we need to make restrictions that +forbid anyone to deny you these rights or to ask you to +surrender the rights. These restrictions translate to +certain responsibilities for you if you distribute copies of +the software, or if you modify it. + +For example, if you distribute copies of such a program, +whether gratis or for a fee, you must give the recipients +all the rights that you have. You must make sure that they, +too, receive or can get the source code. And you must show +them these terms so they know their rights. + +We protect your rights with two steps: (1) copyright the +software, and (2) offer you this license which gives you +legal permission to copy, distribute and/or modify the +software. + +Also, for each author's protection and ours, we want to make +certain that everyone understands that there is no warranty +for this free software. If the software is modified by +someone else and passed on, we want its recipients to know +that what they have is not the original, so that any +problems introduced by others will not reflect on the +original authors' reputations. + +Finally, any free program is threatened constantly by +software patents. We wish to avoid the danger that +redistributors of a free program will individually obtain +patent licenses, in effect making the program proprietary. +To prevent this, we have made it clear that any patent must +be licensed for everyone's free use or not licensed at all. + +The precise terms and conditions for copying, distribution +and modification follow. + +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND +MODIFICATION + +0. This License applies to any program or other work which +contains a notice placed by the copyright holder saying it +may be distributed under the terms of this General Public +License. The "Program", below, refers to any such program or +work, and a "work based on the Program" means either the +Program or any derivative work under copyright law: that is +to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into +another language. (Hereinafter, translation is included +without limitation in the term "modification".) Each +licensee is addressed as "you". + +Activities other than copying, distribution and modification +are not covered by this License; they are outside its scope. +The act of running the Program is not restricted, and the +output from the Program is covered only if its contents +constitute a work based on the Program (independent of +having been made by running the Program). Whether that is +true depends on what the Program does. + +1. You may copy and distribute verbatim copies of the +Program's source code as you receive it, in any medium, +provided that you conspicuously and appropriately publish on +each copy an appropriate copyright notice and disclaimer of +warranty; keep intact all the notices that refer to this +License and to the absence of any warranty; and give any +other recipients of the Program a copy of this License along +with the Program. + +You may charge a fee for the physical act of transferring a +copy, and you may at your option offer warranty protection +in exchange for a fee. + +2. You may modify your copy or copies of the Program or any +portion of it, thus forming a work based on the Program, and +copy and distribute such modifications or work under the +terms of Section 1 above, provided that you also meet all of +these conditions: + + a) You must cause the modified files to carry prominent + notices stating that you changed the files and the date + of any change. + + b) You must cause any work that you distribute or + publish, that in whole or in part contains or is derived + from the Program or any part thereof, to be licensed as + a whole at no charge to all third parties under the + terms of this License. + + c) If the modified program normally reads commands + interactively when run, you must cause it, when started + running for such interactive use in the most ordinary + way, to print or display an announcement including an + appropriate copyright notice and a notice that there is + no warranty (or else, saying that you provide a + warranty) and that users may redistribute the program + under these conditions, and telling the user how to view + a copy of this License. (Exception: if the Program + itself is interactive but does not normally print such + an announcement, your work based on the Program is not + required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the +Program, and can be reasonably considered independent and +separate works in themselves, then this License, and its +terms, do not apply to those sections when you distribute +them as separate works. But when you distribute the same +sections as part of a whole which is a work based on the +Program, the distribution of the whole must be on the terms +of this License, whose permissions for other licensees +extend to the entire whole, and thus to each and every part +regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights +or contest your rights to work written entirely by you; +rather, the intent is to exercise the right to control the +distribution of derivative or collective works based on the +Program. + +In addition, mere aggregation of another work not based on +the Program with the Program (or with a work based on the +Program) on a volume of a storage or distribution medium +does not bring the other work under the scope of this +License. + +3. You may copy and distribute the Program (or a work based +on it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you +also do one of the following: + + a) Accompany it with the complete corresponding + machine-readable source code, which must be distributed + under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least + three years, to give any third party, for a charge no + more than your cost of physically performing source + distribution, a complete machine-readable copy of the + corresponding source code, to be distributed under the + terms of Sections 1 and 2 above on a medium customarily + used for software interchange; or, + + c) Accompany it with the information you received as to + the offer to distribute corresponding source code. (This + alternative is allowed only for noncommercial + distribution and only if you received the program in + object code or executable form with such an offer, in + accord with Subsection b above.) + +The source code for a work means the preferred form of the +work for making modifications to it. For an executable work, +complete source code means all the source code for all +modules it contains, plus any associated interface +definition files, plus the scripts used to control +compilation and installation of the executable. However, as +a special exception, the source code distributed need not +include anything that is normally distributed (in either +source or binary form) with the major components (compiler, +kernel, and so on) of the operating system on which the +executable runs, unless that component itself accompanies +the executable. + +If distribution of executable or object code is made by +offering access to copy from a designated place, then +offering equivalent access to copy the source code from the +same place counts as distribution of the source code, even +though third parties are not compelled to copy the source +along with the object code. + +4. You may not copy, modify, sublicense, or distribute the +Program except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense or distribute +the Program is void, and will automatically terminate your +rights under this License. However, parties who have +received copies, or rights, from you under this License will +not have their licenses terminated so long as such parties +remain in full compliance. + +5. You are not required to accept this License, since you +have not signed it. However, nothing else grants you +permission to modify or distribute the Program or its +derivative works. These actions are prohibited by law if you +do not accept this License. Therefore, by modifying or +distributing the Program (or any work based on the Program), +you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or +modifying the Program or works based on it. + +6. Each time you redistribute the Program (or any work based +on the Program), the recipient automatically receives a +license from the original licensor to copy, distribute or +modify the Program subject to these terms and conditions. +You may not impose any further restrictions on the +recipients' exercise of the rights granted herein. You are +not responsible for enforcing compliance by third parties to +this License. + +7. If, as a consequence of a court judgment or allegation of +patent infringement or for any other reason (not limited to +patent issues), conditions are imposed on you (whether by +court order, agreement or otherwise) that contradict the +conditions of this License, they do not excuse you from the +conditions of this License. If you cannot distribute so as +to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a +consequence you may not distribute the Program at all. For +example, if a patent license would not permit royalty-free +redistribution of the Program by all those who receive +copies directly or indirectly through you, then the only way +you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or +unenforceable under any particular circumstance, the balance +of the section is intended to apply and the section as a +whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to +infringe any patents or other property right claims or to +contest validity of any such claims; this section has the +sole purpose of protecting the integrity of the free +software distribution system, which is implemented by public +license practices. Many people have made generous +contributions to the wide range of software distributed +through that system in reliance on consistent application of +that system; it is up to the author/donor to decide if he or +she is willing to distribute software through any other +system and a licensee cannot impose that choice. + +This section is intended to make thoroughly clear what is +believed to be a consequence of the rest of this License. + +8. If the distribution and/or use of the Program is +restricted in certain countries either by patents or by +copyrighted interfaces, the original copyright holder who +places the Program under this License may add an explicit +geographical distribution limitation excluding those +countries, so that distribution is permitted only in or +among countries not thus excluded. In such case, this +License incorporates the limitation as if written in the +body of this License. + +9. The Free Software Foundation may publish revised and/or +new versions of the General Public License from time to +time. Such new versions will be similar in spirit to the +present version, but may differ in detail to address new +problems or concerns. + +Each version is given a distinguishing version number. If +the Program specifies a version number of this License which +applies to it and "any later version", you have the option +of following the terms and conditions either of that version +or of any later version published by the Free Software +Foundation. If the Program does not specify a version number +of this License, you may choose any version ever published +by the Free Software Foundation. + +10. If you wish to incorporate parts of the Program into +other free programs whose distribution conditions are +different, write to the author to ask for permission. For +software which is copyrighted by the Free Software +Foundation, write to the Free Software Foundation; we +sometimes make exceptions for this. Our decision will be +guided by the two goals of preserving the free status of all +derivatives of our free software and of promoting the +sharing and reuse of software generally. + +NO WARRANTY + +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS +NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE +COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM +"AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR +IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE +OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE +DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + +12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED +TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY +WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED +ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, +SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF +THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT +LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR +LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE +PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH +HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + +If you develop a new program, and you want it to be of the +greatest possible use to the public, the best way to achieve +this is to make it free software which everyone can +redistribute and change under these terms. + +To do so, attach the following notices to the program. It is +safest to attach them to the start of each source file to +most effectively convey the exclusion of warranty; and each +file should have at least the "copyright" line and a pointer +to where the full notice is found. + + One line to give the program's name and a brief idea of + what it does. Copyright (C) <year> <name of author> + + This program is free software; you can redistribute it + and/or modify it under the terms of the GNU General + Public License as published by the Free Software + Foundation; either version 2 of the License, or (at your + option) any later version. + + This program is distributed in the hope that it will be + useful, but WITHOUT ANY WARRANTY; without even the + implied warranty of MERCHANTABILITY or FITNESS FOR A + PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General + Public License along with this program; if not, write to + the Free Software Foundation, Inc., 59 Temple Place, + Suite 330, Boston, MA 02111-1307 USA + +Also add information on how to contact you by electronic and +paper mail. + +If the program is interactive, make it output a short notice +like this when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of + author Gnomovision comes with ABSOLUTELY NO WARRANTY; + for details type `show w'. This is free software, and + you are welcome to redistribute it under certain + conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show +the appropriate parts of the General Public License. Of +course, the commands you use may be called something other +than `show w' and `show c'; they could even be mouse-clicks +or menu items--whatever suits your program. + +You should also get your employer (if you work as a +programmer) or your school, if any, to sign a "copyright +disclaimer" for the program, if necessary. Here is a sample; +alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in + the program `Gnomovision' (which makes passes at + compilers) written by James Hacker. + + signature of Ty Coon, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating +your program into proprietary programs. If your program is a +subroutine library, you may consider it more useful to +permit linking proprietary applications with the library. If +this is what you want to do, use the GNU Library General +Public License instead of this License. + + +"CLASSPATH" EXCEPTION TO THE GPL VERSION 2 + + +Certain source files distributed by Sun Microsystems, Inc. +are subject to the following clarification and special +exception to the GPL Version 2, but only where Sun has expressly +included in the particular source file's header the words +"Sun designates this particular file as subject to the +"Classpath" exception as provided by Sun in the License file +that accompanied this code." + +Linking this library statically or dynamically with other +modules is making a combined work based on this library. +Thus, the terms and conditions of the GNU General Public +License Version 2 cover the whole combination. + +As a special exception, the copyright holders of this +library give you permission to link this library with +independent modules to produce an executable, regardless of +the license terms of these independent modules, and to copy +and distribute the resulting executable under terms of your +choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license +of that module. An independent module is a module which is +not derived from or based on this library. If you modify +this library, you may extend this exception to your version +of the library, but you are not obligated to do so. If you +do not wish to do so, delete this exception statement from +your version. diff --git a/applemenu/external/binaries-list b/applemenu/external/binaries-list index 635a78de2..8463b994d 100644 --- a/applemenu/external/binaries-list +++ b/applemenu/external/binaries-list @@ -15,3 +15,4 @@ # specific language governing permissions and limitations # under the License. 1D14F4B56AD34841339698565B17BBAE755B0E61 applemenu-external-desktop-classes.zip +9A7C8D43E0ECC6ACED43970512FF42EF0717DC7C com.massisframework:orange-extensions:1.3.1 diff --git a/applemenu/external/orange-extensions-1.3.1-license.txt b/applemenu/external/orange-extensions-1.3.1-license.txt new file mode 100644 index 000000000..26279816e --- /dev/null +++ b/applemenu/external/orange-extensions-1.3.1-license.txt @@ -0,0 +1,36 @@ +Name: Orange Extensions +Version: 1.3.1 +License: BSD +Description: com.apple classes for cross-compilation. + +This jar was created by decompiling AppleJavaExtensions.jar (completely consistent +with its BSD-like license), and adding the new Java 5 methods. + +Apple's license does not specify that their copyright notice should be included +in modified versions (only complete, unmodified ones), so I'm putting it under 3-clause +BSD just to protect myself from liability. + +Copyright (c) 2010, Yuvi Masory +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + * Neither the name Yuvi Masory nor the + names of other contributors may be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL Yuvi Masory BE LIABLE FOR ANY +DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/applemenu/nbproject/project.properties b/applemenu/nbproject/project.properties index 64ab6bdfe..a06a886f8 100644 --- a/applemenu/nbproject/project.properties +++ b/applemenu/nbproject/project.properties @@ -19,3 +19,5 @@ javac.compilerargs=-Xlint -Xlint:-serial javac.source=1.6 nbm.needs.restart=true is.eager=true +cp.extra=external/orange-extensions-1.3.1.jar +bootclasspath.prepend=${build.dir}/desktop-classes-classes \ No newline at end of file diff --git a/applemenu/src/com/apple/eawt/AboutHandler.java b/applemenu/src/com/apple/eawt/AboutHandler.java deleted file mode 100644 index 4c24e05ad..000000000 --- a/applemenu/src/com/apple/eawt/AboutHandler.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -/* this is stub code written based on Apple EAWT package javadoc published at - * http://developer.apple.com. It makes compiling code which uses Apple EAWT - * on non-Mac platforms possible. The compiled stub classes should never be - * included in the final product. - */ - -package com.apple.eawt; - -import com.apple.eawt.AppEvent.AboutEvent; - -public interface AboutHandler { - - public void handleAbout(final AboutEvent e); -} diff --git a/applemenu/src/com/apple/eawt/AppEvent.java b/applemenu/src/com/apple/eawt/AppEvent.java deleted file mode 100644 index 44d6b2889..000000000 --- a/applemenu/src/com/apple/eawt/AppEvent.java +++ /dev/null @@ -1,73 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -/* this is stub code written based on Apple EAWT package javadoc published at - * http://developer.apple.com. It makes compiling code which uses Apple EAWT - * on non-Mac platforms possible. The compiled stub classes should never be - * included in the final product. - */ - -package com.apple.eawt; - -import java.io.File; -import java.net.URI; -import java.util.*; -import java.awt.Window; - -public abstract class AppEvent extends EventObject { - AppEvent() { - super(null); - } - - public abstract static class FilesEvent extends AppEvent { - public List<File> getFiles() { return null; } - } - - public static class OpenFilesEvent extends FilesEvent { - public String getSearchTerm() { return null;} - } - - public static class PrintFilesEvent extends FilesEvent {} - - public static class OpenURIEvent extends AppEvent { - public URI getURI() { return null;} - } - - public static class AboutEvent extends AppEvent { } - - public static class PreferencesEvent extends AppEvent { } - - public static class QuitEvent extends AppEvent { } - - public static class AppReOpenedEvent extends AppEvent { } - - public static class AppForegroundEvent extends AppEvent { } - - public static class AppHiddenEvent extends AppEvent { } - - public static class UserSessionEvent extends AppEvent { } - - public static class ScreenSleepEvent extends AppEvent { } - - public static class SystemSleepEvent extends AppEvent { } - - public static class FullScreenEvent extends AppEvent { - public Window getWindow() { return null;} - } -} diff --git a/applemenu/src/com/apple/eawt/AppEventListener.java b/applemenu/src/com/apple/eawt/AppEventListener.java deleted file mode 100644 index 3b41a00bf..000000000 --- a/applemenu/src/com/apple/eawt/AppEventListener.java +++ /dev/null @@ -1,29 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -/* this is stub code written based on Apple EAWT package javadoc published at - * http://developer.apple.com. It makes compiling code which uses Apple EAWT - * on non-Mac platforms possible. The compiled stub classes should never be - * included in the final product. - */ - -package com.apple.eawt; - -public interface AppEventListener { } - diff --git a/applemenu/src/com/apple/eawt/Application.java b/applemenu/src/com/apple/eawt/Application.java deleted file mode 100644 index c4a89485a..000000000 --- a/applemenu/src/com/apple/eawt/Application.java +++ /dev/null @@ -1,56 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -/* this is stub code written based on Apple EAWT package javadoc published at - * http://developer.apple.com. It makes compiling code which uses Apple EAWT - * on non-Mac platforms possible. The compiled stub classes should never be - * included in the final product. - */ - -package com.apple.eawt; - -import java.awt.Image; -import java.awt.PopupMenu; -import javax.swing.JMenuBar; - -public class Application -{ - public static Application getApplication() { return null; } - public void addAppEventListener(final AppEventListener listener) {} - public void removeAppEventListener(final AppEventListener listener) {} - public void setAboutHandler(final AboutHandler aboutHandler) {} - public void setPreferencesHandler(final PreferencesHandler preferencesHandler) {} - public void setOpenFileHandler(final OpenFilesHandler openFileHandler) {} - public void setPrintFileHandler(final PrintFilesHandler printFileHandler) {} - public void setOpenURIHandler(final OpenURIHandler openURIHandler) {} - public void setQuitHandler(final QuitHandler quitHandler) {} - public void setQuitStrategy(final QuitStrategy strategy) {} - public void enableSuddenTermination() {} - public void disableSuddenTermination() {} - public void requestForeground(final boolean allWindows) {} - public void requestUserAttention(final boolean critical) {} - public void openHelpViewer() {} - public void setDockMenu(final PopupMenu menu) {} - public PopupMenu getDockMenu() { return null; } - public void setDockIconImage(final Image image) {} - public Image getDockIconImage() { return null; } - public void setDockIconBadge(final String badge) {} - public void setDefaultMenuBar(final JMenuBar menuBar) {} -} - diff --git a/applemenu/src/com/apple/eawt/ApplicationBeanInfo.java b/applemenu/src/com/apple/eawt/ApplicationBeanInfo.java deleted file mode 100644 index 269af2e65..000000000 --- a/applemenu/src/com/apple/eawt/ApplicationBeanInfo.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -/* this is stub code written based on Apple EAWT package javadoc published at - * http://developer.apple.com. It makes compiling code which uses Apple EAWT - * on non-Mac platforms possible. The compiled stub classes should never be - * included in the final product. - */ - -package com.apple.eawt; - -public class ApplicationBeanInfo extends java.beans.SimpleBeanInfo -{ - public java.awt.Image getIcon(int iconKind) { return null; } -} - - diff --git a/applemenu/src/com/apple/eawt/FullScreenUtilities.java b/applemenu/src/com/apple/eawt/FullScreenUtilities.java deleted file mode 100644 index d1154edd8..000000000 --- a/applemenu/src/com/apple/eawt/FullScreenUtilities.java +++ /dev/null @@ -1,31 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package com.apple.eawt; - -import java.awt.Window; - -/* this is stub code written based on Apple EAWT package javadoc published at - * http://developer.apple.com. It makes compiling code which uses Apple EAWT - * on non-Mac platforms possible. The compiled stub classes should never be - * included in the final product. - */ -public class FullScreenUtilities { - - public static void setWindowCanFullScreen( Window w, boolean canFullScreen ) {} -} diff --git a/applemenu/src/com/apple/eawt/OpenFilesHandler.java b/applemenu/src/com/apple/eawt/OpenFilesHandler.java deleted file mode 100644 index f48ba1871..000000000 --- a/applemenu/src/com/apple/eawt/OpenFilesHandler.java +++ /dev/null @@ -1,32 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -/* this is stub code written based on Apple EAWT package javadoc published at - * http://developer.apple.com. It makes compiling code which uses Apple EAWT - * on non-Mac platforms possible. The compiled stub classes should never be - * included in the final product. - */ - -package com.apple.eawt; - -import com.apple.eawt.AppEvent.OpenFilesEvent; - -public interface OpenFilesHandler { - public void openFiles(final OpenFilesEvent e); -} diff --git a/applemenu/src/com/apple/eawt/OpenURIHandler.java b/applemenu/src/com/apple/eawt/OpenURIHandler.java deleted file mode 100644 index 6c8474156..000000000 --- a/applemenu/src/com/apple/eawt/OpenURIHandler.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -/* this is stub code written based on Apple EAWT package javadoc published at - * http://developer.apple.com. It makes compiling code which uses Apple EAWT - * on non-Mac platforms possible. The compiled stub classes should never be - * included in the final product. - */ - -package com.apple.eawt; - -import com.apple.eawt.AppEvent.OpenURIEvent; - -public interface OpenURIHandler { - public void openURI(final OpenURIEvent e); -} - diff --git a/applemenu/src/com/apple/eawt/PreferencesHandler.java b/applemenu/src/com/apple/eawt/PreferencesHandler.java deleted file mode 100644 index 3958194f0..000000000 --- a/applemenu/src/com/apple/eawt/PreferencesHandler.java +++ /dev/null @@ -1,32 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -/* this is stub code written based on Apple EAWT package javadoc published at - * http://developer.apple.com. It makes compiling code which uses Apple EAWT - * on non-Mac platforms possible. The compiled stub classes should never be - * included in the final product. - */ - -package com.apple.eawt; - -import com.apple.eawt.AppEvent.PreferencesEvent; - -public interface PreferencesHandler { - public void handlePreferences(final PreferencesEvent e); -} diff --git a/applemenu/src/com/apple/eawt/PrintFilesHandler.java b/applemenu/src/com/apple/eawt/PrintFilesHandler.java deleted file mode 100644 index 4230d16df..000000000 --- a/applemenu/src/com/apple/eawt/PrintFilesHandler.java +++ /dev/null @@ -1,32 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -/* this is stub code written based on Apple EAWT package javadoc published at - * http://developer.apple.com. It makes compiling code which uses Apple EAWT - * on non-Mac platforms possible. The compiled stub classes should never be - * included in the final product. - */ - -package com.apple.eawt; - -import com.apple.eawt.AppEvent.PrintFilesEvent; - -public interface PrintFilesHandler { - public void printFiles(final PrintFilesEvent e); -} diff --git a/applemenu/src/com/apple/eawt/QuitHandler.java b/applemenu/src/com/apple/eawt/QuitHandler.java deleted file mode 100644 index c6b82d869..000000000 --- a/applemenu/src/com/apple/eawt/QuitHandler.java +++ /dev/null @@ -1,32 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -/* this is stub code written based on Apple EAWT package javadoc published at - * http://developer.apple.com. It makes compiling code which uses Apple EAWT - * on non-Mac platforms possible. The compiled stub classes should never be - * included in the final product. - */ - -package com.apple.eawt; - -import com.apple.eawt.AppEvent.QuitEvent; - -public interface QuitHandler { - public void handleQuitRequestWith(final QuitEvent e, final QuitResponse response); -} diff --git a/applemenu/src/com/apple/eawt/QuitResponse.java b/applemenu/src/com/apple/eawt/QuitResponse.java deleted file mode 100644 index 67da57c8a..000000000 --- a/applemenu/src/com/apple/eawt/QuitResponse.java +++ /dev/null @@ -1,32 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -/* this is stub code written based on Apple EAWT package javadoc published at - * http://developer.apple.com. It makes compiling code which uses Apple EAWT - * on non-Mac platforms possible. The compiled stub classes should never be - * included in the final product. - */ - -package com.apple.eawt; - -public class QuitResponse { - public void performQuit() {} - - public void cancelQuit() {} -} diff --git a/applemenu/src/com/apple/eawt/QuitStrategy.java b/applemenu/src/com/apple/eawt/QuitStrategy.java deleted file mode 100644 index fc9dc794b..000000000 --- a/applemenu/src/com/apple/eawt/QuitStrategy.java +++ /dev/null @@ -1,31 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -/* this is stub code written based on Apple EAWT package javadoc published at - * http://developer.apple.com. It makes compiling code which uses Apple EAWT - * on non-Mac platforms possible. The compiled stub classes should never be - * included in the final product. - */ - -package com.apple.eawt; - -public enum QuitStrategy { - SYSTEM_EXIT_0, - CLOSE_ALL_WINDOWS -} diff --git a/autoupdate.services/l10n.list b/autoupdate.services/l10n.list index 5f86d11c2..828f273e6 100644 --- a/autoupdate.services/l10n.list +++ b/autoupdate.services/l10n.list @@ -1,44 +1,20 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. +# http://www.apache.org/licenses/LICENSE-2.0 # -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. # -# Contributor(s): -# -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. # autoupdate/services read global ${l10n-module}/libsrc/**/Bundle.properties diff --git a/autoupdate.services/test/unit/src/org/netbeans/api/autoupdate/UpdateProviderFactoryCreateTest.java b/autoupdate.services/test/unit/src/org/netbeans/api/autoupdate/UpdateProviderFactoryCreateTest.java index f59cd2f1e..c42fa549a 100644 --- a/autoupdate.services/test/unit/src/org/netbeans/api/autoupdate/UpdateProviderFactoryCreateTest.java +++ b/autoupdate.services/test/unit/src/org/netbeans/api/autoupdate/UpdateProviderFactoryCreateTest.java @@ -23,7 +23,6 @@ import java.util.List; import org.netbeans.junit.MockServices; import org.netbeans.junit.NbTestCase; -import org.netbeans.modules.autoupdate.services.UpdateUnitFactoryTest; import org.netbeans.modules.autoupdate.updateprovider.AutoupdateCatalogProvider; /** @@ -50,7 +49,7 @@ protected void tearDown () throws Exception { public void testCreate () throws Exception { String name = "new-one"; String displayName = "Newone"; - URL url = UpdateUnitFactoryTest.class.getResource ("data/catalog.xml"); + URL url = getClass().getResource ("/org/netbeans/modules/autoupdate/updateprovider/data/catalog.xml"); UpdateUnitProvider newone = UpdateUnitProviderFactory.getDefault ().create(name, displayName, url); assertNotNull ("New provider was created.", newone); @@ -71,13 +70,13 @@ public void testCreate () throws Exception { public static class MyProvider extends AutoupdateCatalogProvider { public MyProvider () { - super ("test-updates-provider", "test-updates-provider", UpdateUnitFactoryTest.class.getResource ("data/catalog.xml")); + super ("test-updates-provider", "test-updates-provider", UpdateProviderFactoryCreateTest.class.getResource ("/org/netbeans/modules/autoupdate/updateprovider/data/catalog.xml")); } } public static class MyProvider2 extends AutoupdateCatalogProvider { public MyProvider2 () { - super ("test-updates-provider-2", "test-updates-provider-2", UpdateUnitFactoryTest.class.getResource ("data/catalog.xml")); + super ("test-updates-provider-2", "test-updates-provider-2", UpdateProviderFactoryCreateTest.class.getResource ("/org/netbeans/modules/autoupdate/updateprovider/data/catalog.xml")); } } } diff --git a/autoupdate.services/test/unit/src/org/netbeans/api/autoupdate/UpdateProviderFactoryTest.java b/autoupdate.services/test/unit/src/org/netbeans/api/autoupdate/UpdateProviderFactoryTest.java index ae4d2e64b..32eef949c 100644 --- a/autoupdate.services/test/unit/src/org/netbeans/api/autoupdate/UpdateProviderFactoryTest.java +++ b/autoupdate.services/test/unit/src/org/netbeans/api/autoupdate/UpdateProviderFactoryTest.java @@ -19,11 +19,9 @@ package org.netbeans.api.autoupdate; -import java.net.URL; import java.util.List; import org.netbeans.junit.MockServices; import org.netbeans.junit.NbTestCase; -import org.netbeans.modules.autoupdate.services.UpdateUnitFactoryTest; import org.netbeans.modules.autoupdate.updateprovider.AutoupdateCatalogProvider; /** @@ -72,13 +70,13 @@ public void testSetEnable () { public static class MyProvider extends AutoupdateCatalogProvider { public MyProvider () { - super ("test-updates-provider", "test-updates-provider", UpdateUnitFactoryTest.class.getResource ("data/catalog.xml")); + super ("test-updates-provider", "test-updates-provider", UpdateProviderFactoryTest.class.getResource ("data/catalog.xml")); } } public static class MyProvider2 extends AutoupdateCatalogProvider { public MyProvider2 () { - super ("test-updates-provider-2", "test-updates-provider-2", UpdateUnitFactoryTest.class.getResource ("data/catalog.xml")); + super ("test-updates-provider-2", "test-updates-provider-2", UpdateProviderFactoryTest.class.getResource ("/org/netbeans/modules/autoupdate/updateprovider/data/catalog.xml")); } } } diff --git a/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/services/ExecutablePermissionsTest.java b/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/services/ExecutablePermissionsTestDisabled.java similarity index 94% rename from autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/services/ExecutablePermissionsTest.java rename to autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/services/ExecutablePermissionsTestDisabled.java index dc950cc91..513ddecb7 100644 --- a/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/services/ExecutablePermissionsTest.java +++ b/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/services/ExecutablePermissionsTestDisabled.java @@ -1,91 +1,91 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.netbeans.modules.autoupdate.services; - -import java.io.File; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; -import org.netbeans.api.autoupdate.UpdateUnit; -import org.netbeans.spi.autoupdate.UpdateItem; -import org.netbeans.spi.autoupdate.UpdateProvider; - -/** - * - * @author Dmitry Lipin - */ -public class ExecutablePermissionsTest extends NbmAdvancedTestCase { - - private UpdateProvider p = null; - private String testModuleVersion = "1.0"; - private String testModuleName = "org.yourorghere.executable.permissions"; - - public ExecutablePermissionsTest(String name) { - super(name); - } - - @Override - protected void setUp() throws IOException, Exception { - super.setUp(); - } - - @Override - public boolean canRun() { - return super.canRun() && !System.getProperty("os.name").startsWith("Windows"); - } - - private String generateExecutablePermissionsModuleElement() { - String res = "\n<module codenamebase=\"" + testModuleName + "\" " + - "homepage=\"http://www.netbeans.org/\" distribution=\"nbresloc:/org/netbeans/api/autoupdate/data/org-yourorghere-executable-permissions.nbm\" " + - "license=\"standard-nbm-license.txt\" downloadsize=\"5122\" " + - "needsrestart=\"false\" moduleauthor=\"\" " + - "eager=\"false\" " + - "releasedate=\"2006/02/23\">\n"; - res += "<manifest OpenIDE-Module=\"" + testModuleName + "\" " + - "OpenIDE-Module-Name=\"" + testModuleName + "\" " + - "AutoUpdate-Show-In-Client=\"true\" " + - "OpenIDE-Module-Specification-Version=\"" + testModuleVersion + "\"/>\n"; - res += "</module>"; - return res; - } - - public void testExecutablePermissionsModule() throws IOException { - String os = !org.openide.util.Utilities.isUnix() ? "Windows" : "Unix"; - String catalog = generateCatalog(generateExecutablePermissionsModuleElement()); - - p = createUpdateProvider(catalog); - p.refresh(true); - - Map<String, UpdateUnit> unitImpls = new HashMap<String, UpdateUnit>(); - Map<String, UpdateItem> updates = p.getUpdateItems(); - assertNotNull("Some modules are installed.", updates); - assertFalse("Some modules are installed.", updates.isEmpty()); - assertTrue(testModuleName + " found in parsed items.", updates.keySet().contains(testModuleName + "_" + testModuleVersion)); - - Map<String, UpdateUnit> newImpls = UpdateUnitFactory.getDefault().appendUpdateItems(unitImpls, p); - assertNotNull("Some units found.", newImpls); - assertFalse("Some units found.", newImpls.isEmpty()); - - UpdateUnit u1 = newImpls.get(testModuleName); - installUpdateUnit(u1); - File f = new File(userDir, "bin/start.sh"); - assertTrue("File " + f + " should exist after module installation", f.exists()); - assertTrue("File " + f + " is not executable after module installation", f.canExecute()); - } -} +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.netbeans.modules.autoupdate.services; + +import java.io.File; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; +import org.netbeans.api.autoupdate.UpdateUnit; +import org.netbeans.spi.autoupdate.UpdateItem; +import org.netbeans.spi.autoupdate.UpdateProvider; + +/** + * + * @author Dmitry Lipin + */ +public class ExecutablePermissionsTestDisabled extends NbmAdvancedTestCase { + + private UpdateProvider p = null; + private String testModuleVersion = "1.0"; + private String testModuleName = "org.yourorghere.executable.permissions"; + + public ExecutablePermissionsTestDisabled(String name) { + super(name); + } + + @Override + protected void setUp() throws IOException, Exception { + super.setUp(); + } + + @Override + public boolean canRun() { + return super.canRun() && !System.getProperty("os.name").startsWith("Windows"); + } + + private String generateExecutablePermissionsModuleElement() { + String res = "\n<module codenamebase=\"" + testModuleName + "\" " + + "homepage=\"http://www.netbeans.org/\" distribution=\"nbresloc:/org/netbeans/api/autoupdate/data/org-yourorghere-executable-permissions.nbm\" " + + "license=\"standard-nbm-license.txt\" downloadsize=\"5122\" " + + "needsrestart=\"false\" moduleauthor=\"\" " + + "eager=\"false\" " + + "releasedate=\"2006/02/23\">\n"; + res += "<manifest OpenIDE-Module=\"" + testModuleName + "\" " + + "OpenIDE-Module-Name=\"" + testModuleName + "\" " + + "AutoUpdate-Show-In-Client=\"true\" " + + "OpenIDE-Module-Specification-Version=\"" + testModuleVersion + "\"/>\n"; + res += "</module>"; + return res; + } + + public void testExecutablePermissionsModule() throws IOException { + String os = !org.openide.util.Utilities.isUnix() ? "Windows" : "Unix"; + String catalog = generateCatalog(generateExecutablePermissionsModuleElement()); + + p = createUpdateProvider(catalog); + p.refresh(true); + + Map<String, UpdateUnit> unitImpls = new HashMap<String, UpdateUnit>(); + Map<String, UpdateItem> updates = p.getUpdateItems(); + assertNotNull("Some modules are installed.", updates); + assertFalse("Some modules are installed.", updates.isEmpty()); + assertTrue(testModuleName + " found in parsed items.", updates.keySet().contains(testModuleName + "_" + testModuleVersion)); + + Map<String, UpdateUnit> newImpls = UpdateUnitFactory.getDefault().appendUpdateItems(unitImpls, p); + assertNotNull("Some units found.", newImpls); + assertFalse("Some units found.", newImpls.isEmpty()); + + UpdateUnit u1 = newImpls.get(testModuleName); + installUpdateUnit(u1); + File f = new File(userDir, "bin/start.sh"); + assertTrue("File " + f + " should exist after module installation", f.exists()); + assertTrue("File " + f + " is not executable after module installation", f.canExecute()); + } +} diff --git a/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/services/InstallEagerModuleTest.java b/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/services/InstallEagerModuleTest.java index 2cbf86b02..9e28fd5a8 100644 --- a/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/services/InstallEagerModuleTest.java +++ b/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/services/InstallEagerModuleTest.java @@ -1,167 +1,167 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.netbeans.modules.autoupdate.services; - -import java.io.IOException; -import java.util.List; -import java.util.Map; -import java.util.Set; -import org.netbeans.api.autoupdate.UpdateElement; -import org.netbeans.api.autoupdate.UpdateManager; -import org.netbeans.api.autoupdate.UpdateUnit; -import org.netbeans.api.autoupdate.UpdateUnitProviderFactory; -import org.netbeans.modules.autoupdate.updateprovider.AutoupdateCatalogProvider; -import org.netbeans.modules.autoupdate.updateprovider.ModuleItem; -import org.netbeans.spi.autoupdate.UpdateItem; - -/** - * - * @author Jiri Rechtacek - */ -public class InstallEagerModuleTest extends NbmAdvancedTestCase { - - public InstallEagerModuleTest (String testName) { - super (testName); - } - - public void testIfAutoupdateUnderstandsEagerAttribute () throws IOException { - // Lookup.getDefault ().lookup (ModuleInfo.class); - String eagerModule = "com.sun.testmodule.eager"; - String regularModule = "com.sun.testmodule.regular"; - String catalog = generateCatalog ( - generateModuleElement (eagerModule, "1.3", null, null, false, true, - "org.openide.filesystems > 6.2", - "org.openide.util > 6.2", - "org.openide.modules > 6.2", - "org.openide.nodes > 6.2", - "org.openide.loaders", - "org.openide.io"), - generateModuleElement (regularModule, "1.3", null, null, false, false, - "org.openide.filesystems > 6.2", - "org.openide.util > 6.2", - "org.openide.modules > 6.2", - "org.openide.nodes > 6.2", - "org.openide.loaders", - "org.openide.io") - - ); - AutoupdateCatalogProvider p = createUpdateProvider (catalog); - p.refresh (true); - Map<String, UpdateItem> updates = p.getUpdateItems (); - assertNotNull ("Some modules are installed.", updates); - assertFalse ("Some modules are installed.", updates.isEmpty ()); - - // check being - assertTrue (eagerModule + " found in parsed items.", updates.keySet ().contains (eagerModule + "_1.3")); - assertTrue (regularModule + " found in parsed items.", updates.keySet ().contains (regularModule + "_1.3")); - - // check state - ModuleItem eagerModuleItem = (ModuleItem) Trampoline.SPI.impl (updates.get (eagerModule + "_1.3")); - ModuleItem regularModuleItem = (ModuleItem) Trampoline.SPI.impl (updates.get (regularModule + "_1.3")); - assertTrue (eagerModule + " is eager.", eagerModuleItem.isEager () && ! eagerModuleItem.isAutoload ()); - assertFalse (regularModule + " is regular.", regularModuleItem.isEager () || regularModuleItem.isAutoload ()); - } - - public void testAquireEargersFromManager () throws IOException { - String eagerModule = "com.sun.testmodule.eager"; - String regularModule1 = "org.yourorghere.independent"; - String regularModule2 = "org.yourorghere.engine"; - String catalog = generateCatalog ( - generateModuleElement (eagerModule, "1.0", null, null, false, true, - regularModule1, - regularModule2), - generateModuleElement (regularModule1, "1.0", null, null, false, false), - generateModuleElement (regularModule2, "1.0", null, null, false, false, regularModule1) - - ); - - UpdateUnitProviderFactory.getDefault ().create ("test-update-provider", "test-update-provider", generateFile (catalog)); - UpdateUnitProviderFactory.getDefault ().refreshProviders (null, true); - - Set<UpdateElement> eagerElements = UpdateManagerImpl.getInstance ().getAvailableEagers (); - assertFalse ("Some available eagers are found.", eagerElements.isEmpty ()); - UpdateUnit ea = UpdateManagerImpl.getInstance ().getUpdateUnit (eagerModule); - UpdateElement foundEaEl = eagerElements.iterator ().next (); - UpdateUnit foundEaU = foundEaEl.getUpdateUnit (); - assertEquals ("Same eager UpdateUnit", ea, foundEaU); - - // assertFalse ("Some installed eagers are found.", UpdateManagerImpl.getInstance ().getInstalledEagers ().isEmpty ()); - } - - public void testInstallRegularModule () throws IOException { - String eagerModule = "com.sun.testmodule.eager"; - String regularModule1 = "org.yourorghere.independent"; - String regularModule2 = "org.yourorghere.engine"; - String catalog = generateCatalog ( - generateModuleElement (eagerModule, "1.0", null, null, false, true, - regularModule1, - regularModule2), - generateModuleElement (regularModule1, "1.0", null, null, true, false), - generateModuleElement (regularModule2, "1.0", null, null, true, false, regularModule1) - - ); - - AutoupdateCatalogProvider p = createUpdateProvider (catalog); - p.refresh (true); - Map<String, UpdateItem> updates = p.getUpdateItems (); - - // initial check of updates being and its states - ModuleItem eagerModuleItem = (ModuleItem) Trampoline.SPI.impl (updates.get (eagerModule + "_1.0")); - assertFalse (eagerModuleItem.getModuleInfo ().getDependencies () + " are not empty.", - eagerModuleItem.getModuleInfo ().getDependencies ().isEmpty ()); - ModuleItem regularModule1Item = (ModuleItem) Trampoline.SPI.impl (updates.get (regularModule1 + "_1.0")); - ModuleItem regularModule2Item = (ModuleItem) Trampoline.SPI.impl (updates.get (regularModule2 + "_1.0")); - assertTrue (eagerModule + " is eager.", eagerModuleItem.isEager () && ! eagerModuleItem.isAutoload ()); - assertFalse (regularModule1 + " is regular.", regularModule1Item.isEager () || regularModule1Item.isAutoload ()); - assertFalse (regularModule2 + " is regular.", regularModule2Item.isEager () || regularModule2Item.isAutoload ()); - - // acquire UpdateUnits for test modules - UpdateUnitProviderFactory.getDefault ().create ("test-update-provider", "test-update-provider", generateFile (catalog)); - UpdateUnitProviderFactory.getDefault ().refreshProviders (null, true); - UpdateUnit u1 = UpdateManagerImpl.getInstance ().getUpdateUnit (regularModule1); - assertTrue (UpdateManager.TYPE.KIT_MODULE.equals (u1.getType ())); - - //keep it to prevent GC-ed cache in UpdateManagerImpl - List<UpdateUnit> uuu = UpdateManagerImpl.getInstance ().getUpdateUnits(); - UpdateUnit u2 = UpdateManagerImpl.getInstance ().getUpdateUnit (regularModule2); - UpdateUnit ea = UpdateManagerImpl.getInstance ().getUpdateUnit (eagerModule); - assertNotNull ("Unit " + regularModule1 + " found.", u1); - assertNotNull ("Unit " + regularModule2 + " found.", u2); - assertNotNull ("Unit " + eagerModule + " found.", ea); - - // install regular module 1 - installUpdateUnit (u1); - - // check states installed regular 1 and others - assertNotNull (u1 + " is installed.", u1.getInstalled ()); - assertNull (u2 + " is not installed.", u2.getInstalled ()); - assertNull (ea + " is not installed.", ea.getInstalled ()); - - // installe regular module 2 - installUpdateUnit (u2); - - // check states installed regular 1 and others - assertNotNull (u1 + " is installed.", u1.getInstalled ()); - assertNotNull (u2 + " is installed.", u2.getInstalled ()); - assertNotNull (ea + " is must be installed as well because all required modules are on.", ea.getInstalled ()); - - } - -} +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.netbeans.modules.autoupdate.services; + +import java.io.IOException; +import java.util.List; +import java.util.Map; +import java.util.Set; +import org.netbeans.api.autoupdate.UpdateElement; +import org.netbeans.api.autoupdate.UpdateManager; +import org.netbeans.api.autoupdate.UpdateUnit; +import org.netbeans.api.autoupdate.UpdateUnitProviderFactory; +import org.netbeans.modules.autoupdate.updateprovider.AutoupdateCatalogProvider; +import org.netbeans.modules.autoupdate.updateprovider.ModuleItem; +import org.netbeans.spi.autoupdate.UpdateItem; + +/** + * + * @author Jiri Rechtacek + */ +public class InstallEagerModuleTest extends NbmAdvancedTestCase { + + public InstallEagerModuleTest (String testName) { + super (testName); + } + + public void testIfAutoupdateUnderstandsEagerAttribute () throws IOException { + // Lookup.getDefault ().lookup (ModuleInfo.class); + String eagerModule = "com.sun.testmodule.eager"; + String regularModule = "com.sun.testmodule.regular"; + String catalog = generateCatalog ( + generateModuleElement (eagerModule, "1.3", null, null, false, true, + "org.openide.filesystems > 6.2", + "org.openide.util > 6.2", + "org.openide.modules > 6.2", + "org.openide.nodes > 6.2", + "org.openide.loaders", + "org.openide.io"), + generateModuleElement (regularModule, "1.3", null, null, false, false, + "org.openide.filesystems > 6.2", + "org.openide.util > 6.2", + "org.openide.modules > 6.2", + "org.openide.nodes > 6.2", + "org.openide.loaders", + "org.openide.io") + + ); + AutoupdateCatalogProvider p = createUpdateProvider (catalog); + p.refresh (true); + Map<String, UpdateItem> updates = p.getUpdateItems (); + assertNotNull ("Some modules are installed.", updates); + assertFalse ("Some modules are installed.", updates.isEmpty ()); + + // check being + assertTrue (eagerModule + " found in parsed items.", updates.keySet ().contains (eagerModule + "_1.3")); + assertTrue (regularModule + " found in parsed items.", updates.keySet ().contains (regularModule + "_1.3")); + + // check state + ModuleItem eagerModuleItem = (ModuleItem) Trampoline.SPI.impl (updates.get (eagerModule + "_1.3")); + ModuleItem regularModuleItem = (ModuleItem) Trampoline.SPI.impl (updates.get (regularModule + "_1.3")); + assertTrue (eagerModule + " is eager.", eagerModuleItem.isEager () && ! eagerModuleItem.isAutoload ()); + assertFalse (regularModule + " is regular.", regularModuleItem.isEager () || regularModuleItem.isAutoload ()); + } + + public void testAquireEargersFromManager () throws IOException { + String eagerModule = "com.sun.testmodule.eager"; + String regularModule1 = "org.yourorghere.independent"; + String regularModule2 = "org.yourorghere.engine"; + String catalog = generateCatalog ( + generateModuleElement (eagerModule, "1.0", null, null, false, true, + regularModule1, + regularModule2), + generateModuleElement (regularModule1, "1.0", null, null, false, false), + generateModuleElement (regularModule2, "1.0", null, null, false, false, regularModule1) + + ); + + UpdateUnitProviderFactory.getDefault ().create ("test-update-provider", "test-update-provider", generateFile (catalog)); + UpdateUnitProviderFactory.getDefault ().refreshProviders (null, true); + + Set<UpdateElement> eagerElements = UpdateManagerImpl.getInstance ().getAvailableEagers (); + assertFalse ("Some available eagers are found.", eagerElements.isEmpty ()); + UpdateUnit ea = UpdateManagerImpl.getInstance ().getUpdateUnit (eagerModule); + UpdateElement foundEaEl = eagerElements.iterator ().next (); + UpdateUnit foundEaU = foundEaEl.getUpdateUnit (); + assertEquals ("Same eager UpdateUnit", ea, foundEaU); + + // assertFalse ("Some installed eagers are found.", UpdateManagerImpl.getInstance ().getInstalledEagers ().isEmpty ()); + } + + public void disable_testInstallRegularModule () throws IOException { + String eagerModule = "com.sun.testmodule.eager"; + String regularModule1 = "org.yourorghere.independent"; + String regularModule2 = "org.yourorghere.engine"; + String catalog = generateCatalog ( + generateModuleElement (eagerModule, "1.0", null, null, false, true, + regularModule1, + regularModule2), + generateModuleElement (regularModule1, "1.0", null, null, true, false), + generateModuleElement (regularModule2, "1.0", null, null, true, false, regularModule1) + + ); + + AutoupdateCatalogProvider p = createUpdateProvider (catalog); + p.refresh (true); + Map<String, UpdateItem> updates = p.getUpdateItems (); + + // initial check of updates being and its states + ModuleItem eagerModuleItem = (ModuleItem) Trampoline.SPI.impl (updates.get (eagerModule + "_1.0")); + assertFalse (eagerModuleItem.getModuleInfo ().getDependencies () + " are not empty.", + eagerModuleItem.getModuleInfo ().getDependencies ().isEmpty ()); + ModuleItem regularModule1Item = (ModuleItem) Trampoline.SPI.impl (updates.get (regularModule1 + "_1.0")); + ModuleItem regularModule2Item = (ModuleItem) Trampoline.SPI.impl (updates.get (regularModule2 + "_1.0")); + assertTrue (eagerModule + " is eager.", eagerModuleItem.isEager () && ! eagerModuleItem.isAutoload ()); + assertFalse (regularModule1 + " is regular.", regularModule1Item.isEager () || regularModule1Item.isAutoload ()); + assertFalse (regularModule2 + " is regular.", regularModule2Item.isEager () || regularModule2Item.isAutoload ()); + + // acquire UpdateUnits for test modules + UpdateUnitProviderFactory.getDefault ().create ("test-update-provider", "test-update-provider", generateFile (catalog)); + UpdateUnitProviderFactory.getDefault ().refreshProviders (null, true); + UpdateUnit u1 = UpdateManagerImpl.getInstance ().getUpdateUnit (regularModule1); + assertTrue (UpdateManager.TYPE.KIT_MODULE.equals (u1.getType ())); + + //keep it to prevent GC-ed cache in UpdateManagerImpl + List<UpdateUnit> uuu = UpdateManagerImpl.getInstance ().getUpdateUnits(); + UpdateUnit u2 = UpdateManagerImpl.getInstance ().getUpdateUnit (regularModule2); + UpdateUnit ea = UpdateManagerImpl.getInstance ().getUpdateUnit (eagerModule); + assertNotNull ("Unit " + regularModule1 + " found.", u1); + assertNotNull ("Unit " + regularModule2 + " found.", u2); + assertNotNull ("Unit " + eagerModule + " found.", ea); + + // install regular module 1 + installUpdateUnit (u1); + + // check states installed regular 1 and others + assertNotNull (u1 + " is installed.", u1.getInstalled ()); + assertNull (u2 + " is not installed.", u2.getInstalled ()); + assertNull (ea + " is not installed.", ea.getInstalled ()); + + // installe regular module 2 + installUpdateUnit (u2); + + // check states installed regular 1 and others + assertNotNull (u1 + " is installed.", u1.getInstalled ()); + assertNotNull (u2 + " is installed.", u2.getInstalled ()); + assertNotNull (ea + " is must be installed as well because all required modules are on.", ea.getInstalled ()); + + } + +} diff --git a/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/services/UpdateFromNbmTest.java b/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/services/UpdateFromNbmTest.java deleted file mode 100644 index 0fa54ae00..000000000 --- a/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/services/UpdateFromNbmTest.java +++ /dev/null @@ -1,144 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.netbeans.modules.autoupdate.services; - -import java.io.File; -import java.net.URL; -import java.util.List; -import java.util.Set; -import org.netbeans.api.autoupdate.InstallSupport; -import org.netbeans.api.autoupdate.OperationContainer; -import org.netbeans.api.autoupdate.OperationException; -import org.netbeans.api.autoupdate.OperationSupport.Restarter; -import org.netbeans.api.autoupdate.TestUtils; -import org.netbeans.api.autoupdate.TestUtils.CustomItemsProvider; -import org.netbeans.api.autoupdate.UpdateElement; -import org.netbeans.api.autoupdate.UpdateManager; -import org.netbeans.api.autoupdate.UpdateUnit; -import org.netbeans.api.autoupdate.UpdateUnitProviderFactory; -import org.netbeans.junit.MockServices; - -/** - * - * @author Radek Matous - */ -public class UpdateFromNbmTest extends OperationsTestImpl { - - public UpdateFromNbmTest(String testName) { - super(testName); - } - - protected String moduleCodeNameBaseForTest() { - return "org.yourorghere.engine"; - } - - public void testSelf() throws Exception { - UpdateUnit toUpdate = UpdateManagerImpl.getInstance().getUpdateUnit(moduleCodeNameBaseForTest()); - assertNotNull(toUpdate); - assertEquals(2, toUpdate.getAvailableUpdates ().size()); - UpdateElement engine1_0 = toUpdate.getAvailableUpdates ().get (1); - assertNotNull(engine1_0); - assertEquals("1.0",engine1_0.getSpecificationVersion().toString()); - installModule(toUpdate, engine1_0); - toUpdate = UpdateManagerImpl.getInstance().getUpdateUnit(moduleCodeNameBaseForTest()); - assertNotNull(toUpdate.getInstalled()); - - MockServices.setServices(MyProvider.class, CustomItemsProvider.class); - URL engineURL = TestUtils.class.getResource("data/org-yourorghere-engine-1-2.nbm"); - assertNotNull(engineURL); - File engineFile = TestUtils.getFile(this, engineURL); - assertTrue(engineFile.exists()); - - URL independentURL = TestUtils.class.getResource("data/org-yourorghere-independent-1-1.nbm"); - assertNotNull(independentURL); - File independentFile = TestUtils.getFile(this, independentURL); - assertTrue(independentFile.exists()); - - String source = "local-downloaded"; - List<UpdateUnit> units = UpdateUnitProviderFactory.getDefault ().create (source, new File[] {engineFile, independentFile}). - getUpdateUnits (UpdateManager.TYPE.MODULE); - assertEquals(2, units.size()); - UpdateUnit nbmsEngine = null; - if (units.get(0).getCodeName().indexOf("engine") != -1) { - nbmsEngine = units.get (0); - } else if (units.get(1).getCodeName().indexOf("engine") != -1) { - nbmsEngine = units.get (1); - } - assertNotNull (nbmsEngine); - assertNotNull(nbmsEngine.getInstalled()); - assertEquals(1, nbmsEngine.getAvailableUpdates().size()); - UpdateElement engine1_2 = nbmsEngine.getAvailableUpdates().get(0); - assertEquals(source,engine1_2.getSource()); - assertEquals("1.2",engine1_2.getSpecificationVersion().toString()); - OperationContainer<InstallSupport> oc = OperationContainer.createForUpdate(); - OperationContainer.OperationInfo info = oc.add(nbmsEngine, engine1_2); - assertNotNull(info); - final Set brokeDeps = info.getBrokenDependencies(); - assertEquals("One broken dep: " + brokeDeps, 1, brokeDeps.size()); - String brokenDep = (String)brokeDeps.toArray()[0]; - assertEquals("module org.yourorghere.independent > 1.1",brokenDep); - assertEquals(0, info.getRequiredElements().size()); - UpdateUnit independentEngine = null; - if (units.get(0).getCodeName().indexOf("independent") != -1) { - independentEngine = units.get (0); - } else if (units.get(1).getCodeName().indexOf("independent") != -1) { - independentEngine = units.get (1); - } - assertNotNull (independentEngine); - assertNotNull(independentEngine.getInstalled()); - - UpdateElement independent1_1 = independentEngine.getAvailableUpdates().get(0); - assertEquals(source,independent1_1.getSource()); - assertEquals("1.1",independent1_1.getSpecificationVersion().toString()); - - OperationContainer.OperationInfo info2 = oc.add(independentEngine, independent1_1); - assertEquals(0, info.getBrokenDependencies().size()); - assertEquals(0, info.getRequiredElements().size()); - assertEquals(0, info2.getBrokenDependencies().size()); - assertEquals(0, info2.getRequiredElements().size()); - - InstallSupport support = oc.getSupport(); - assertNotNull(support); - - InstallSupport.Validator v = support.doDownload(null, false); - assertNotNull(v); - InstallSupport.Installer i = support.doValidate(v, null); - assertNotNull(i); - //assertNotNull(support.getCertificate(i, upEl)); - Restarter r = null; - try { - r = support.doInstall(i, null); - } catch (OperationException ex) { - if (OperationException.ERROR_TYPE.INSTALL == ex.getErrorType ()) { - // can ingore - // module system cannot load the module either - } else { - fail (ex.toString ()); - } - } - assertNotNull ("Install update " + engine1_2 + " needs restart.", r); - support.doRestartLater (r); - - MockServices.setServices(MyProvider.class, CustomItemsProvider.class); - assertTrue (nbmsEngine + " is waiting for Restart IDE.", nbmsEngine.isPending ()); - } - -} - diff --git a/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/services/UpdateUnitFactoryTest.java b/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/services/UpdateUnitFactoryTest.java deleted file mode 100644 index 6c03c29b4..000000000 --- a/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/services/UpdateUnitFactoryTest.java +++ /dev/null @@ -1,188 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.netbeans.modules.autoupdate.services; - -import org.netbeans.modules.autoupdate.updateprovider.InstalledModuleProvider; -import java.io.File; -import java.io.IOException; -import java.net.URISyntaxException; -import java.net.URL; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import org.netbeans.api.autoupdate.UpdateElement; -import org.netbeans.api.autoupdate.UpdateUnit; -import org.netbeans.junit.NbTestCase; -import org.netbeans.modules.autoupdate.updateprovider.AutoupdateCatalogProvider; -import org.netbeans.modules.autoupdate.updateprovider.AutoupdateInfoParserTest; -import org.netbeans.modules.autoupdate.updateprovider.LocalNBMsProvider; -import org.netbeans.spi.autoupdate.UpdateItem; -import org.netbeans.spi.autoupdate.UpdateProvider; -import org.openide.modules.ModuleInfo; -import org.openide.util.Lookup; -import org.openide.util.Utilities; - -/** - * - * @author Jiri Rechtacek - */ -public class UpdateUnitFactoryTest extends NbTestCase { - - public UpdateUnitFactoryTest (String testName) { - super (testName); - } - - private UpdateProvider p = null; - private static File NBM_FILE = null; - - @Override - protected void setUp () throws IOException, URISyntaxException { - clearWorkDir (); - System.setProperty ("netbeans.user", getWorkDirPath ()); - Lookup.getDefault ().lookup (ModuleInfo.class); - try { - p = new MyProvider (); - } catch (Exception x) { - x.printStackTrace (); - } - p.refresh (true); - URL urlToFile = AutoupdateInfoParserTest.class.getResource ("data/org-yourorghere-depending.nbm"); - NBM_FILE = Utilities.toFile(urlToFile.toURI ()); - assertNotNull ("data/org-yourorghere-depending.nbm file must found.", NBM_FILE); - } - - public void testAppendInstalledModule () { - Map<String, UpdateUnit> unitImpls = new HashMap<String, UpdateUnit> (); - Map<String, ModuleInfo> modules = InstalledModuleProvider.getInstalledModules (); - assertNotNull ("Some modules are installed.", modules); - assertFalse ("Some modules are installed.", modules.isEmpty ()); - - Map<String, UpdateUnit> newImpls = UpdateUnitFactory.getDefault ().appendUpdateItems ( - unitImpls, - InstalledModuleProvider.getDefault()); - assertNotNull ("Some units found.", newImpls); - assertFalse ("Some units found.", newImpls.isEmpty ()); - - int modulesC = 0; - int features = 0; - - for (UpdateUnit unit : newImpls.values ()) { - switch (unit.getType ()) { - case KIT_MODULE : - modulesC ++; - break; - case MODULE : - modulesC ++; - break; - case LOCALIZATION : - case FEATURE : - features ++; - break; - } - } - assertEquals ("Same size of installed modules and UpdateUnit (except FeatureElement).", modules.size (), modulesC); - } - - public void testAppendUpdateItems () throws IOException { - Map<String, UpdateUnit> unitImpls = new HashMap<String, UpdateUnit> (); - Map<String, UpdateItem> updates = p.getUpdateItems (); - assertNotNull ("Some upadtes are present.", updates); - assertFalse ("Some upadtes are present.", updates.isEmpty ()); - - Map<String, UpdateUnit> newImpls = UpdateUnitFactory.getDefault ().appendUpdateItems ( - unitImpls, - p); - assertNotNull ("Some units found.", newImpls); - assertFalse ("Some units found.", newImpls.isEmpty ()); - - int modules = 0; - int features = 0; - int kits = 0; - int installed = 0; - - for (UpdateUnit unit : newImpls.values ()) { - switch (unit.getType ()) { - case MODULE : - modules ++; - if (unit.getInstalled () != null) { - installed ++; - } - break; - case KIT_MODULE : - kits ++; - if (unit.getInstalled () != null) { - installed ++; - } - break; - case LOCALIZATION : - case FEATURE : - features ++; - break; - } - } - assertEquals ("Same size of upadtes (modules + features) and UpdateUnit", updates.size () - installed, kits + modules + features); - } - - public void testGroupInstalledAndUpdates () { - Map<String, UpdateUnit> unitImpls = new HashMap<String, UpdateUnit> (); - Map<String, UpdateUnit> installedImpls = UpdateUnitFactory.getDefault ().appendUpdateItems ( - unitImpls, - InstalledModuleProvider.getDefault()); - Map<String, UpdateUnit> updatedImpls = UpdateUnitFactory.getDefault ().appendUpdateItems ( - installedImpls, p); - boolean isInstalledAndHasUpdates = false; - for (String id : updatedImpls.keySet ()) { - UpdateUnit impl = updatedImpls.get (id); - UpdateElement installed = impl.getInstalled (); - List<UpdateElement> updates = impl.getAvailableUpdates (); - isInstalledAndHasUpdates = isInstalledAndHasUpdates || installed != null && updates != null && ! updates.isEmpty (); - if (installed != null && updates != null && ! updates.isEmpty ()) { - assertTrue ("Updates of module " + id + " contain newer one.", updates.get (0).getSpecificationVersion ().compareTo (installed.getSpecificationVersion ()) > 0); - } - } - assertTrue ("Some module is installed and has updates.", isInstalledAndHasUpdates); - } - - public void testGetUpdateUnitsInNbmFile () { - UpdateProvider localFilesProvider = new LocalNBMsProvider ("test-local-file-provider", NBM_FILE); - assertNotNull ("LocalNBMsProvider found for file " + NBM_FILE, localFilesProvider); - Map<String, UpdateUnit> units = UpdateUnitFactory.getDefault().getUpdateUnits (localFilesProvider); - assertNotNull ("UpdateUnit found in provider " + localFilesProvider.getDisplayName (), units); - assertEquals ("Provider providers only once unit in provider" + localFilesProvider.getName (), 1, units.size ()); - String id = units.keySet ().iterator ().next (); - assertNotNull (localFilesProvider.getName () + " gives UpdateUnit.", units.get (id)); - UpdateUnit u = units.get (id); - assertNull ("Unit is not installed.", u.getInstalled ()); - assertNotNull ("Unit has update.", u.getAvailableUpdates ()); - assertFalse ("Unit.getAvailableUpdates() is not empty.", u.getAvailableUpdates ().isEmpty ()); - assertEquals ("Unit has only one update.", 1, u.getAvailableUpdates ().size ()); - UpdateElement el = u.getAvailableUpdates ().get (0); - assertEquals ("org.yourorghere.depending", el.getCodeName ()); - assertEquals ("1.0", el.getSpecificationVersion ()); - assertEquals (0, el.getDownloadSize ()); - } - - public static class MyProvider extends AutoupdateCatalogProvider { - public MyProvider () { - super ("test-updates-provider", "test-updates-provider", UpdateUnitFactoryTest.class.getResource ("data/catalog.xml")); - } - } - -} diff --git a/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/services/VerifyFileTest.java b/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/services/VerifyFileTestDisabled.java similarity index 96% rename from autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/services/VerifyFileTest.java rename to autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/services/VerifyFileTestDisabled.java index d722d244d..5f62139f6 100644 --- a/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/services/VerifyFileTest.java +++ b/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/services/VerifyFileTestDisabled.java @@ -34,13 +34,13 @@ import org.netbeans.api.autoupdate.TestUtils; import org.netbeans.junit.NbTestCase; -public class VerifyFileTest extends NbTestCase { +public class VerifyFileTestDisabled extends NbTestCase { - private static final Logger LOG = Logger.getLogger(VerifyFileTest.class.getName()); + private static final Logger LOG = Logger.getLogger(VerifyFileTestDisabled.class.getName()); private KeyStore ks; - public VerifyFileTest(String testName) { + public VerifyFileTestDisabled(String testName) { super(testName); } diff --git a/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/updateprovider/AutoupdateInfoParserTest.java b/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/updateprovider/AutoupdateInfoParserTestDisabled.java similarity index 91% rename from autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/updateprovider/AutoupdateInfoParserTest.java rename to autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/updateprovider/AutoupdateInfoParserTestDisabled.java index 2ae69d1b9..068f682df 100644 --- a/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/updateprovider/AutoupdateInfoParserTest.java +++ b/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/updateprovider/AutoupdateInfoParserTestDisabled.java @@ -33,9 +33,9 @@ * * @author Jiri Rechtacek */ -public class AutoupdateInfoParserTest extends DefaultTestCase { +public class AutoupdateInfoParserTestDisabled extends DefaultTestCase { - public AutoupdateInfoParserTest (String testName) { + public AutoupdateInfoParserTestDisabled (String testName) { super (testName); } @@ -45,7 +45,7 @@ public AutoupdateInfoParserTest (String testName) { @Override protected void setUp() throws Exception { super.setUp(); - URL urlToFile = AutoupdateInfoParserTest.class.getResource ("data/org-yourorghere-depending.nbm"); + URL urlToFile = AutoupdateInfoParserTestDisabled.class.getResource ("data/org-yourorghere-depending.nbm"); NBM_FILE = Utilities.toFile(urlToFile.toURI ()); assertNotNull ("data/org-yourorghere-depending.nbm file must found.", NBM_FILE); } diff --git a/beans/l10n.list b/beans/l10n.list index 7ea5288cd..b0d0eb9ba 100644 --- a/beans/l10n.list +++ b/beans/l10n.list @@ -1,2 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# beans/src/**/Bundle*.properties beans/src/**/*.html diff --git a/beans/test/qa-functional/data/projects/Beans/nbproject/project.properties b/beans/test/qa-functional/data/projects/Beans/nbproject/project.properties index 4f95663a0..2191f050f 100644 --- a/beans/test/qa-functional/data/projects/Beans/nbproject/project.properties +++ b/beans/test/qa-functional/data/projects/Beans/nbproject/project.properties @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + annotation.processing.enabled=true annotation.processing.enabled.in.editor=false annotation.processing.processors.list= diff --git a/beans/test/qa-functional/data/projects/Beans/nbproject/project.xml b/beans/test/qa-functional/data/projects/Beans/nbproject/project.xml index 330411588..abdd496b0 100644 --- a/beans/test/qa-functional/data/projects/Beans/nbproject/project.xml +++ b/beans/test/qa-functional/data/projects/Beans/nbproject/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.java.j2seproject</type> <configuration> diff --git a/core.kit/test/perf/src/META-INF/services/org.openide.ErrorManager b/core.kit/test/perf/src/META-INF/services/org.openide.ErrorManager index e8d45dcd0..a370e5806 100644 --- a/core.kit/test/perf/src/META-INF/services/org.openide.ErrorManager +++ b/core.kit/test/perf/src/META-INF/services/org.openide.ErrorManager @@ -1 +1,18 @@ -org.openide.ErrorManagerTest$EM +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +org.openide.ErrorManagerTest$EM \ No newline at end of file diff --git a/core.kit/test/unit/src/META-INF/services/org.openide.actions.ActionManager b/core.kit/test/unit/src/META-INF/services/org.openide.actions.ActionManager index c50281fde..f280303ae 100644 --- a/core.kit/test/unit/src/META-INF/services/org.openide.actions.ActionManager +++ b/core.kit/test/unit/src/META-INF/services/org.openide.actions.ActionManager @@ -1 +1,18 @@ -#-org.netbeans.core.ModuleActions +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#-org.netbeans.core.ModuleActions \ No newline at end of file diff --git a/core.netigso/test/unit/data/jars/activate/META-INF/services/java.util.concurrent.Callable b/core.netigso/test/unit/data/jars/activate/META-INF/services/java.util.concurrent.Callable index df1d6c18e..ed6852490 100644 --- a/core.netigso/test/unit/data/jars/activate/META-INF/services/java.util.concurrent.Callable +++ b/core.netigso/test/unit/data/jars/activate/META-INF/services/java.util.concurrent.Callable @@ -1 +1,18 @@ -org.activate.Query +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +org.activate.Query \ No newline at end of file diff --git a/core.windows/l10n.list b/core.windows/l10n.list index 4c72e4ff8..ef2520ddd 100644 --- a/core.windows/l10n.list +++ b/core.windows/l10n.list @@ -1,44 +1,20 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. +# http://www.apache.org/licenses/LICENSE-2.0 # -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. # -# Contributor(s): -# -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. # core/windows read global ${l10n-module}/src/org/netbeans/core/windows/view/ui/toolbars/*.gif diff --git a/csl.api/src/META-INF/services/org.netbeans.modules.editor.settings.storage.spi.StorageFilter b/csl.api/src/META-INF/services/org.netbeans.modules.editor.settings.storage.spi.StorageFilter index 2cb546b4a..43809ca71 100644 --- a/csl.api/src/META-INF/services/org.netbeans.modules.editor.settings.storage.spi.StorageFilter +++ b/csl.api/src/META-INF/services/org.netbeans.modules.editor.settings.storage.spi.StorageFilter @@ -1 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# org.netbeans.modules.csl.core.GsfEditorSettings \ No newline at end of file diff --git a/csl.api/src/META-INF/services/org.netbeans.spi.java.classpath.ClassPathProvider b/csl.api/src/META-INF/services/org.netbeans.spi.java.classpath.ClassPathProvider index 369624f68..94708a05a 100644 --- a/csl.api/src/META-INF/services/org.netbeans.spi.java.classpath.ClassPathProvider +++ b/csl.api/src/META-INF/services/org.netbeans.spi.java.classpath.ClassPathProvider @@ -1,2 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# org.netbeans.modules.csl.core.ProjectClassPathProvider -#position=100 +#position=100 \ No newline at end of file diff --git a/csl.api/src/META-INF/services/org.netbeans.spi.jumpto.symbol.SymbolProvider b/csl.api/src/META-INF/services/org.netbeans.spi.jumpto.symbol.SymbolProvider index 1524cd7bd..3c37b4d25 100644 --- a/csl.api/src/META-INF/services/org.netbeans.spi.jumpto.symbol.SymbolProvider +++ b/csl.api/src/META-INF/services/org.netbeans.spi.jumpto.symbol.SymbolProvider @@ -1 +1,18 @@ -org.netbeans.modules.csl.core.TypeAndSymbolProvider$SymbolProviderImpl +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +org.netbeans.modules.csl.core.TypeAndSymbolProvider$SymbolProviderImpl \ No newline at end of file diff --git a/csl.api/src/META-INF/services/org.netbeans.spi.jumpto.type.TypeProvider b/csl.api/src/META-INF/services/org.netbeans.spi.jumpto.type.TypeProvider index 1f27978ca..f5ffb4562 100644 --- a/csl.api/src/META-INF/services/org.netbeans.spi.jumpto.type.TypeProvider +++ b/csl.api/src/META-INF/services/org.netbeans.spi.jumpto.type.TypeProvider @@ -1 +1,18 @@ -org.netbeans.modules.csl.core.TypeAndSymbolProvider$TypeProviderImpl +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +org.netbeans.modules.csl.core.TypeAndSymbolProvider$TypeProviderImpl \ No newline at end of file diff --git a/css.editor/test/unit/data/testfiles/testHtmlApplication/nbproject/project.properties b/css.editor/test/unit/data/testfiles/testHtmlApplication/nbproject/project.properties index 5a4e39e52..e981c3165 100644 --- a/css.editor/test/unit/data/testfiles/testHtmlApplication/nbproject/project.properties +++ b/css.editor/test/unit/data/testfiles/testHtmlApplication/nbproject/project.properties @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + auxiliary.org-netbeans-modules-web-clientproject-api.js_2e_libs_2e_folder=js/libs config.folder=${file.reference.testHtmlApplication-config} file.reference.testHtmlApplication-config=config diff --git a/css.editor/test/unit/data/testfiles/testHtmlApplication/nbproject/project.xml b/css.editor/test/unit/data/testfiles/testHtmlApplication/nbproject/project.xml index 711b2a004..7bb800fb6 100644 --- a/css.editor/test/unit/data/testfiles/testHtmlApplication/nbproject/project.xml +++ b/css.editor/test/unit/data/testfiles/testHtmlApplication/nbproject/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.web.clientproject</type> <configuration> diff --git a/css.lib/src/org/netbeans/modules/css/lib/antlrv4.patch b/css.lib/src/org/netbeans/modules/css/lib/antlrv4.patch index 732e53a80..66a220077 100644 --- a/css.lib/src/org/netbeans/modules/css/lib/antlrv4.patch +++ b/css.lib/src/org/netbeans/modules/css/lib/antlrv4.patch @@ -1,3 +1,21 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ diff -r 63baafcd69f5 css.lib/build.xml --- a/css.lib/build.xml Thu Feb 14 17:26:26 2013 +0100 +++ b/css.lib/build.xml Mon Feb 18 14:26:29 2013 +0100 diff --git a/css.lib/src/org/netbeans/modules/css/lib/api/CssTokenId.java b/css.lib/src/org/netbeans/modules/css/lib/api/CssTokenId.java index b24c7b3fe..e88ef3fef 100644 --- a/css.lib/src/org/netbeans/modules/css/lib/api/CssTokenId.java +++ b/css.lib/src/org/netbeans/modules/css/lib/api/CssTokenId.java @@ -1,45 +1,20 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * Contributor(s): +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * The Original Software is NetBeans. The Initial Developer of the Original - * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun - * Microsystems, Inc. All Rights Reserved. + * http://www.apache.org/licenses/LICENSE-2.0 * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version , indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.netbeans.modules.css.lib.api; diff --git a/css.lib/src/org/netbeans/modules/css/lib/api/NodeType.java b/css.lib/src/org/netbeans/modules/css/lib/api/NodeType.java index 46f1d960f..61918bc4a 100644 --- a/css.lib/src/org/netbeans/modules/css/lib/api/NodeType.java +++ b/css.lib/src/org/netbeans/modules/css/lib/api/NodeType.java @@ -1,43 +1,20 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2011 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only (GPL) or the Common - * Development and Distribution License(CDDL) (collectively, the - * License). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the Classpath exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * Portions Copyrighted [year] [name of copyright owner] - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * Contributor(s): + * http://www.apache.org/licenses/LICENSE-2.0 * - * Portions Copyrighted 2011 Sun Microsystems, Inc. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.netbeans.modules.css.lib.api; diff --git a/css.lib/test/unit/src/org/netbeans/modules/css/lib/api/properties/TokenAcceptorsTest.java b/css.lib/test/unit/src/org/netbeans/modules/css/lib/api/properties/TokenAcceptorsTest.java index 1deff0f60..ef8e77721 100644 --- a/css.lib/test/unit/src/org/netbeans/modules/css/lib/api/properties/TokenAcceptorsTest.java +++ b/css.lib/test/unit/src/org/netbeans/modules/css/lib/api/properties/TokenAcceptorsTest.java @@ -1,43 +1,20 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2011 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only (getToken("GPL") or the Common - * Development and Distribution License(getToken("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * Contributor(s): + * http://www.apache.org/licenses/LICENSE-2.0 * - * Portions Copyrighted 2011 Sun Microsystems, Inc. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.netbeans.modules.css.lib.api.properties; diff --git a/css.prep/src/org/netbeans/modules/css/prep/ui/resources/style.less b/css.prep/src/org/netbeans/modules/css/prep/ui/resources/style.less index d1233f5ae..72d73afdf 100644 --- a/css.prep/src/org/netbeans/modules/css/prep/ui/resources/style.less +++ b/css.prep/src/org/netbeans/modules/css/prep/ui/resources/style.less @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "/*"> <#assign licensePrefix = ""> diff --git a/css.prep/src/org/netbeans/modules/css/prep/ui/resources/style.scss b/css.prep/src/org/netbeans/modules/css/prep/ui/resources/style.scss index d1233f5ae..72d73afdf 100644 --- a/css.prep/src/org/netbeans/modules/css/prep/ui/resources/style.scss +++ b/css.prep/src/org/netbeans/modules/css/prep/ui/resources/style.scss @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "/*"> <#assign licensePrefix = ""> diff --git a/css.prep/test/qa-functional/data/css_prep/nbproject/project.properties b/css.prep/test/qa-functional/data/css_prep/nbproject/project.properties index 120b0df98..79a5c9e91 100644 --- a/css.prep/test/qa-functional/data/css_prep/nbproject/project.properties +++ b/css.prep/test/qa-functional/data/css_prep/nbproject/project.properties @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + auxiliary.org-netbeans-modules-css-prep.less_2e_compiler_2e_options= auxiliary.org-netbeans-modules-css-prep.less_2e_configured=true auxiliary.org-netbeans-modules-css-prep.less_2e_enabled=false diff --git a/css.prep/test/qa-functional/data/css_prep/nbproject/project.xml b/css.prep/test/qa-functional/data/css_prep/nbproject/project.xml index 99fd54685..15fdf2a2c 100644 --- a/css.prep/test/qa-functional/data/css_prep/nbproject/project.xml +++ b/css.prep/test/qa-functional/data/css_prep/nbproject/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.web.clientproject</type> <configuration> diff --git a/css.prep/test/unit/data/testProject/nbproject/project.properties b/css.prep/test/unit/data/testProject/nbproject/project.properties index ab0fce407..765047da3 100644 --- a/css.prep/test/unit/data/testProject/nbproject/project.properties +++ b/css.prep/test/unit/data/testProject/nbproject/project.properties @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + config.folder=${file.reference.HTML5Application-config} file.reference.HTML5Application-config=config file.reference.HTML5Application-public_html=public_html diff --git a/css.prep/test/unit/data/testProject/nbproject/project.xml b/css.prep/test/unit/data/testProject/nbproject/project.xml index b7e65e804..def7ca524 100644 --- a/css.prep/test/unit/data/testProject/nbproject/project.xml +++ b/css.prep/test/unit/data/testProject/nbproject/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.web.clientproject</type> <configuration> diff --git a/css.visual/test/qa-functional/data/CSSTestProject/nbproject/project.properties b/css.visual/test/qa-functional/data/CSSTestProject/nbproject/project.properties index 8be9ed641..d2477161a 100644 --- a/css.visual/test/qa-functional/data/CSSTestProject/nbproject/project.properties +++ b/css.visual/test/qa-functional/data/CSSTestProject/nbproject/project.properties @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + build.classes.dir=${build.web.dir}/WEB-INF/classes build.classes.excludes=**/*.java,**/*.form build.dir=build diff --git a/css.visual/test/qa-functional/data/CSSTestProject/nbproject/project.xml b/css.visual/test/qa-functional/data/CSSTestProject/nbproject/project.xml index 7afd5d7fe..e782f6e91 100644 --- a/css.visual/test/qa-functional/data/CSSTestProject/nbproject/project.xml +++ b/css.visual/test/qa-functional/data/CSSTestProject/nbproject/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.web.project</type> <configuration> diff --git a/db/l10n.list b/db/l10n.list index cd5763be4..1a156be74 100644 --- a/db/l10n.list +++ b/db/l10n.list @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# # db read global ${l10n-module}/libsrc/**/Bundle.properties diff --git a/debugger.jpda.ui/test/qa-functional/data/debugTestProject/build.xml b/debugger.jpda.ui/test/qa-functional/data/debugTestProject/build.xml index e5721b927..4a40f5a0f 100644 --- a/debugger.jpda.ui/test/qa-functional/data/debugTestProject/build.xml +++ b/debugger.jpda.ui/test/qa-functional/data/debugTestProject/build.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- You may freely edit this file. See commented blocks below for --> <!-- some examples of how to customize the build. --> <!-- (If you delete it and reopen the project it will be recreated.) --> diff --git a/debugger.jpda.ui/test/qa-functional/data/debugTestProject/src/examples/advanced/README.txt b/debugger.jpda.ui/test/qa-functional/data/debugTestProject/src/examples/advanced/README.txt index f679845ef..6af3b174f 100644 --- a/debugger.jpda.ui/test/qa-functional/data/debugTestProject/src/examples/advanced/README.txt +++ b/debugger.jpda.ui/test/qa-functional/data/debugTestProject/src/examples/advanced/README.txt @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + This package contains the MemoryView program, which displays a window displaying the current JVM memory and allows you to explicitly run garbage collection. diff --git a/debugger.jpda.ui/test/qa-functional/data/debugTestProjectAnt/build.xml b/debugger.jpda.ui/test/qa-functional/data/debugTestProjectAnt/build.xml index 6c20a30dd..2d8edc814 100644 --- a/debugger.jpda.ui/test/qa-functional/data/debugTestProjectAnt/build.xml +++ b/debugger.jpda.ui/test/qa-functional/data/debugTestProjectAnt/build.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- You may freely edit this file. See commented blocks below for --> <!-- some examples of how to customize the build. --> <!-- (If you delete it and reopen the project it will be recreated.) --> diff --git a/debugger.jpda.ui/test/qa-functional/data/debugTestProjectAnt/nbproject/project.properties b/debugger.jpda.ui/test/qa-functional/data/debugTestProjectAnt/nbproject/project.properties index f4cfe8dcc..f36e2c1ed 100644 --- a/debugger.jpda.ui/test/qa-functional/data/debugTestProjectAnt/nbproject/project.properties +++ b/debugger.jpda.ui/test/qa-functional/data/debugTestProjectAnt/nbproject/project.properties @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + annotation.processing.enabled=true annotation.processing.enabled.in.editor=false annotation.processing.processors.list= diff --git a/debugger.jpda.ui/test/qa-functional/data/debugTestProjectAnt/nbproject/project.xml b/debugger.jpda.ui/test/qa-functional/data/debugTestProjectAnt/nbproject/project.xml index 3e5791219..540886e6e 100644 --- a/debugger.jpda.ui/test/qa-functional/data/debugTestProjectAnt/nbproject/project.xml +++ b/debugger.jpda.ui/test/qa-functional/data/debugTestProjectAnt/nbproject/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.java.j2seproject</type> <configuration> diff --git a/diff/l10n.list b/diff/l10n.list index 973af08b0..bb8e49e84 100644 --- a/diff/l10n.list +++ b/diff/l10n.list @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# # diff read global ${l10n-module}/src/org/netbeans/modules/**/builtin/visualizer/*.gif diff --git a/dlight.nativeexecution/external/exechlp-1.0-license.txt b/dlight.nativeexecution/external/exechlp-1.0-license.txt index d7145641f..01cfaab41 100644 --- a/dlight.nativeexecution/external/exechlp-1.0-license.txt +++ b/dlight.nativeexecution/external/exechlp-1.0-license.txt @@ -1,7 +1,7 @@ Name: exechlp Version: 1.0 Description: binaries that used by dlight.nativeexecution module -License: TBD +License: Apache License 2.0 OSR: - Origin: - Files: exechlp-1.0.zip contains killall process_start pty pty_open sigqueue stat unbuffer.so for different platforms @@ -15,5 +15,205 @@ unbuffer.so - used when unbuffering is required Use of exechlp version 1.0 is governed by the terms of the license below: -TBD + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/dlight.nativeexecution/tools/buildall.sh b/dlight.nativeexecution/tools/buildall.sh index a7be89a1a..403a8caf8 100644 --- a/dlight.nativeexecution/tools/buildall.sh +++ b/dlight.nativeexecution/tools/buildall.sh @@ -1,41 +1,20 @@ #/bin/bash -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. +# http://www.apache.org/licenses/LICENSE-2.0 # -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. -# -# Contributor(s): +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. # To build in debug mode export DEBUG=Y variable diff --git a/dlight.nativeexecution/tools/killall/make/Makefile.gmake b/dlight.nativeexecution/tools/killall/make/Makefile.gmake index d175ad8c8..329cfdf16 100644 --- a/dlight.nativeexecution/tools/killall/make/Makefile.gmake +++ b/dlight.nativeexecution/tools/killall/make/Makefile.gmake @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + OBJS := $(SOURCES:$(ROOT_DIR)/%.c=$(OBJ_DIR)/%.o) OBJ_DIRS := $(SRC_DIRS:$(ROOT_DIR)/%=$(OBJ_DIR)/%) DEPS := $(OBJS:%.o=%.d) diff --git a/dlight.nativeexecution/tools/killall/make/Makefile.make b/dlight.nativeexecution/tools/killall/make/Makefile.make index 51f4b190b..4a9027a68 100644 --- a/dlight.nativeexecution/tools/killall/make/Makefile.make +++ b/dlight.nativeexecution/tools/killall/make/Makefile.make @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + OBJS = $(SOURCES:$(ROOT_DIR)/%.c=$(OBJ_DIR)/%.o) OBJ_DIRS = $(SRC_DIRS:$(ROOT_DIR)/%=$(OBJ_DIR)/%) $(OBJS) := DEP = $(@:$(OBJ_DIR)/%.o=$(ROOT_DIR)/%.c) diff --git a/dlight.nativeexecution/tools/killall/make/line b/dlight.nativeexecution/tools/killall/make/line index ed7e2fb7d..674d08d34 100755 --- a/dlight.nativeexecution/tools/killall/make/line +++ b/dlight.nativeexecution/tools/killall/make/line @@ -1,5 +1,22 @@ #!/bin/sh +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + SYM=${1:-=} COLS=`(stty -a | sed -n "s/.*columns[^0-9]*\([0-9]*\).*/\1/p") 2>/dev/null`; test -z "${COLS}" && COLS=`(stty -a | sed -n "s/.*; \([0-9]*\) columns;.*/\1/p") 2>/dev/null`; diff --git a/dlight.nativeexecution/tools/pty/.hgignore b/dlight.nativeexecution/tools/pty/.hgignore index 552d9ac6e..657c9d81f 100644 --- a/dlight.nativeexecution/tools/pty/.hgignore +++ b/dlight.nativeexecution/tools/pty/.hgignore @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. ^.make.state.* ^build/ ^dist/ diff --git a/dlight.nativeexecution/tools/pty/make/Makefile.gmake b/dlight.nativeexecution/tools/pty/make/Makefile.gmake index d175ad8c8..329cfdf16 100644 --- a/dlight.nativeexecution/tools/pty/make/Makefile.gmake +++ b/dlight.nativeexecution/tools/pty/make/Makefile.gmake @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + OBJS := $(SOURCES:$(ROOT_DIR)/%.c=$(OBJ_DIR)/%.o) OBJ_DIRS := $(SRC_DIRS:$(ROOT_DIR)/%=$(OBJ_DIR)/%) DEPS := $(OBJS:%.o=%.d) diff --git a/dlight.nativeexecution/tools/pty/make/Makefile.make b/dlight.nativeexecution/tools/pty/make/Makefile.make index b3ad853e2..846b980e9 100644 --- a/dlight.nativeexecution/tools/pty/make/Makefile.make +++ b/dlight.nativeexecution/tools/pty/make/Makefile.make @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + OBJS = $(SOURCES:$(ROOT_DIR)/%.c=$(OBJ_DIR)/%.o) OBJ_DIRS = $(SRC_DIRS:$(ROOT_DIR)/%=$(OBJ_DIR)/%) $(OBJS) := DEP = $(@:$(OBJ_DIR)/%.o=$(ROOT_DIR)/%.c) diff --git a/dlight.nativeexecution/tools/pty/make/line b/dlight.nativeexecution/tools/pty/make/line index ed7e2fb7d..674d08d34 100755 --- a/dlight.nativeexecution/tools/pty/make/line +++ b/dlight.nativeexecution/tools/pty/make/line @@ -1,5 +1,22 @@ #!/bin/sh +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + SYM=${1:-=} COLS=`(stty -a | sed -n "s/.*columns[^0-9]*\([0-9]*\).*/\1/p") 2>/dev/null`; test -z "${COLS}" && COLS=`(stty -a | sed -n "s/.*; \([0-9]*\) columns;.*/\1/p") 2>/dev/null`; diff --git a/dlight.nativeexecution/tools/unbuffer/make/Makefile.gmake b/dlight.nativeexecution/tools/unbuffer/make/Makefile.gmake index d175ad8c8..329cfdf16 100644 --- a/dlight.nativeexecution/tools/unbuffer/make/Makefile.gmake +++ b/dlight.nativeexecution/tools/unbuffer/make/Makefile.gmake @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + OBJS := $(SOURCES:$(ROOT_DIR)/%.c=$(OBJ_DIR)/%.o) OBJ_DIRS := $(SRC_DIRS:$(ROOT_DIR)/%=$(OBJ_DIR)/%) DEPS := $(OBJS:%.o=%.d) diff --git a/dlight.nativeexecution/tools/unbuffer/make/Makefile.make b/dlight.nativeexecution/tools/unbuffer/make/Makefile.make index b3ad853e2..846b980e9 100644 --- a/dlight.nativeexecution/tools/unbuffer/make/Makefile.make +++ b/dlight.nativeexecution/tools/unbuffer/make/Makefile.make @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + OBJS = $(SOURCES:$(ROOT_DIR)/%.c=$(OBJ_DIR)/%.o) OBJ_DIRS = $(SRC_DIRS:$(ROOT_DIR)/%=$(OBJ_DIR)/%) $(OBJS) := DEP = $(@:$(OBJ_DIR)/%.o=$(ROOT_DIR)/%.c) diff --git a/dlight.nativeexecution/tools/unbuffer/make/line b/dlight.nativeexecution/tools/unbuffer/make/line index ed7e2fb7d..3b9dcaa9e 100755 --- a/dlight.nativeexecution/tools/unbuffer/make/line +++ b/dlight.nativeexecution/tools/unbuffer/make/line @@ -1,5 +1,23 @@ #!/bin/sh +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + + SYM=${1:-=} COLS=`(stty -a | sed -n "s/.*columns[^0-9]*\([0-9]*\).*/\1/p") 2>/dev/null`; test -z "${COLS}" && COLS=`(stty -a | sed -n "s/.*; \([0-9]*\) columns;.*/\1/p") 2>/dev/null`; diff --git a/editor.indent/test/unit/src/META-INF/services/org.netbeans.spi.lexer.LanguageProvider b/editor.indent/test/unit/src/META-INF/services/org.netbeans.spi.lexer.LanguageProvider index 7b3f656a5..50b650ff2 100644 --- a/editor.indent/test/unit/src/META-INF/services/org.netbeans.spi.lexer.LanguageProvider +++ b/editor.indent/test/unit/src/META-INF/services/org.netbeans.spi.lexer.LanguageProvider @@ -1 +1,18 @@ -org.netbeans.lib.lexer.test.TestLanguageProvider +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +org.netbeans.lib.lexer.test.TestLanguageProvider \ No newline at end of file diff --git a/editor.mimelookup/test/unit/src/META-INF/services/org.netbeans.spi.editor.mimelookup.MimeDataProvider b/editor.mimelookup/test/unit/src/META-INF/services/org.netbeans.spi.editor.mimelookup.MimeDataProvider index e3597f0ed..b341b83d4 100644 --- a/editor.mimelookup/test/unit/src/META-INF/services/org.netbeans.spi.editor.mimelookup.MimeDataProvider +++ b/editor.mimelookup/test/unit/src/META-INF/services/org.netbeans.spi.editor.mimelookup.MimeDataProvider @@ -1 +1,18 @@ -org.netbeans.api.editor.mimelookup.test.MockMimeLookup +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +org.netbeans.api.editor.mimelookup.test.MockMimeLookup \ No newline at end of file diff --git a/extexecution.process/external/binaries-list b/extexecution.process/external/binaries-list index 5c27a052f..87de4d3d6 100644 --- a/extexecution.process/external/binaries-list +++ b/extexecution.process/external/binaries-list @@ -14,6 +14,10 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# winp-1.14-patcher.jar is a patched version of the maven artifact: +# 6A56E64B5F9E78D1F30F960425F7758D08B2A390 org.jvnet.winp:winp:1.1 C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505 winp-1.14-patched.jar -2E07375E5CA3A452472F0E87FB33F243F7A5C08C libpam4j-1.1.jar +2E07375E5CA3A452472F0E87FB33F243F7A5C08C org.jvnet.libpam4j:libpam4j:1.1 +# processtreekiller is not available in Maven, and its web page was hosted in Kenai, now extinct. 6819C79348FCF4F5125C834E7D3B742582DCA34D processtreekiller-1.0.7.jar diff --git a/form.j2ee/src/org/netbeans/modules/form/j2ee/resources/templates/MasterDetailForm_form b/form.j2ee/src/org/netbeans/modules/form/j2ee/resources/templates/MasterDetailForm_form index e51a45c08..575303418 100644 --- a/form.j2ee/src/org/netbeans/modules/form/j2ee/resources/templates/MasterDetailForm_form +++ b/form.j2ee/src/org/netbeans/modules/form/j2ee/resources/templates/MasterDetailForm_form @@ -1,5 +1,21 @@ <?xml version="1.0" encoding="UTF-8" ?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> <Form version="1.4" type="org.netbeans.modules.form.forminfo.JPanelFormInfo"> <NonVisualComponents> <Component class="javax.persistence.EntityManager" name="entityManager"> diff --git a/form.j2ee/src/org/netbeans/modules/form/j2ee/resources/templates/MasterDetailForm_java b/form.j2ee/src/org/netbeans/modules/form/j2ee/resources/templates/MasterDetailForm_java index 5b3a9a496..c1a4e2fff 100644 --- a/form.j2ee/src/org/netbeans/modules/form/j2ee/resources/templates/MasterDetailForm_java +++ b/form.j2ee/src/org/netbeans/modules/form/j2ee/resources/templates/MasterDetailForm_java @@ -1,41 +1,19 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. - -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. - -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" - -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. --> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> diff --git a/form/l10n.list b/form/l10n.list index 17f3fa1d2..df67c90b8 100644 --- a/form/l10n.list +++ b/form/l10n.list @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# # form read global ${l10n-module}/src/org/netbeans/modules/form/beaninfo/awt/*.gif diff --git a/form/src/org/netbeans/modules/form/resources/templates/AWTForms/Applet_java b/form/src/org/netbeans/modules/form/resources/templates/AWTForms/Applet_java index 70cab0c02..1c5bc7354 100644 --- a/form/src/org/netbeans/modules/form/resources/templates/AWTForms/Applet_java +++ b/form/src/org/netbeans/modules/form/resources/templates/AWTForms/Applet_java @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> diff --git a/form/src/org/netbeans/modules/form/resources/templates/AWTForms/Dialog_java b/form/src/org/netbeans/modules/form/resources/templates/AWTForms/Dialog_java index 95dd66285..1c6135240 100644 --- a/form/src/org/netbeans/modules/form/resources/templates/AWTForms/Dialog_java +++ b/form/src/org/netbeans/modules/form/resources/templates/AWTForms/Dialog_java @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> diff --git a/form/src/org/netbeans/modules/form/resources/templates/AWTForms/Frame_java b/form/src/org/netbeans/modules/form/resources/templates/AWTForms/Frame_java index 9bbe1320b..d4b4d2567 100644 --- a/form/src/org/netbeans/modules/form/resources/templates/AWTForms/Frame_java +++ b/form/src/org/netbeans/modules/form/resources/templates/AWTForms/Frame_java @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> diff --git a/form/src/org/netbeans/modules/form/resources/templates/AWTForms/Panel_java b/form/src/org/netbeans/modules/form/resources/templates/AWTForms/Panel_java index cc33381c9..a27dea119 100644 --- a/form/src/org/netbeans/modules/form/resources/templates/AWTForms/Panel_java +++ b/form/src/org/netbeans/modules/form/resources/templates/AWTForms/Panel_java @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> diff --git a/form/src/org/netbeans/modules/form/resources/templates/Dialogs/Application_java b/form/src/org/netbeans/modules/form/resources/templates/Dialogs/Application_java index dc56ecd33..c36b1218e 100644 --- a/form/src/org/netbeans/modules/form/resources/templates/Dialogs/Application_java +++ b/form/src/org/netbeans/modules/form/resources/templates/Dialogs/Application_java @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. - -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. - -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" - -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + --> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> diff --git a/form/src/org/netbeans/modules/form/resources/templates/Dialogs/MDIApplication_java b/form/src/org/netbeans/modules/form/resources/templates/Dialogs/MDIApplication_java index a37d68059..836057087 100644 --- a/form/src/org/netbeans/modules/form/resources/templates/Dialogs/MDIApplication_java +++ b/form/src/org/netbeans/modules/form/resources/templates/Dialogs/MDIApplication_java @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. - -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. - -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" - -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + --> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> diff --git a/form/src/org/netbeans/modules/form/resources/templates/Dialogs/OkCancelDialog_java b/form/src/org/netbeans/modules/form/resources/templates/Dialogs/OkCancelDialog_java index e2cadb9e4..4d41792af 100644 --- a/form/src/org/netbeans/modules/form/resources/templates/Dialogs/OkCancelDialog_java +++ b/form/src/org/netbeans/modules/form/resources/templates/Dialogs/OkCancelDialog_java @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. - -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. - -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" - -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + --> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> diff --git a/form/src/org/netbeans/modules/form/resources/templates/SwingForms/BeanForm_java b/form/src/org/netbeans/modules/form/resources/templates/SwingForms/BeanForm_java index db38ea59f..23d6e7415 100644 --- a/form/src/org/netbeans/modules/form/resources/templates/SwingForms/BeanForm_java +++ b/form/src/org/netbeans/modules/form/resources/templates/SwingForms/BeanForm_java @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> diff --git a/form/src/org/netbeans/modules/form/resources/templates/SwingForms/JApplet_java b/form/src/org/netbeans/modules/form/resources/templates/SwingForms/JApplet_java index 866836a7b..09d289e8c 100644 --- a/form/src/org/netbeans/modules/form/resources/templates/SwingForms/JApplet_java +++ b/form/src/org/netbeans/modules/form/resources/templates/SwingForms/JApplet_java @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> diff --git a/form/src/org/netbeans/modules/form/resources/templates/SwingForms/JDialog_java b/form/src/org/netbeans/modules/form/resources/templates/SwingForms/JDialog_java index 53d739276..efb597eba 100644 --- a/form/src/org/netbeans/modules/form/resources/templates/SwingForms/JDialog_java +++ b/form/src/org/netbeans/modules/form/resources/templates/SwingForms/JDialog_java @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> diff --git a/form/src/org/netbeans/modules/form/resources/templates/SwingForms/JFrame_java b/form/src/org/netbeans/modules/form/resources/templates/SwingForms/JFrame_java index db0edab5d..8e2600ffe 100644 --- a/form/src/org/netbeans/modules/form/resources/templates/SwingForms/JFrame_java +++ b/form/src/org/netbeans/modules/form/resources/templates/SwingForms/JFrame_java @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> diff --git a/form/src/org/netbeans/modules/form/resources/templates/SwingForms/JInternalFrame_java b/form/src/org/netbeans/modules/form/resources/templates/SwingForms/JInternalFrame_java index e37869a40..bb03e56d0 100644 --- a/form/src/org/netbeans/modules/form/resources/templates/SwingForms/JInternalFrame_java +++ b/form/src/org/netbeans/modules/form/resources/templates/SwingForms/JInternalFrame_java @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> diff --git a/form/src/org/netbeans/modules/form/resources/templates/SwingForms/JPanel_java b/form/src/org/netbeans/modules/form/resources/templates/SwingForms/JPanel_java index 41a5495b7..ef67e28e4 100644 --- a/form/src/org/netbeans/modules/form/resources/templates/SwingForms/JPanel_java +++ b/form/src/org/netbeans/modules/form/resources/templates/SwingForms/JPanel_java @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> diff --git a/form/test/qa-functional/data/SampleDesktopApplication/build.xml b/form/test/qa-functional/data/SampleDesktopApplication/build.xml index 332e7a6ba..713817af2 100644 --- a/form/test/qa-functional/data/SampleDesktopApplication/build.xml +++ b/form/test/qa-functional/data/SampleDesktopApplication/build.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- You may freely edit this file. See commented blocks below for --> <!-- some examples of how to customize the build. --> <!-- (If you delete it and reopen the project it will be recreated.) --> diff --git a/form/test/qa-functional/data/SampleDesktopApplication/nbproject/project.properties b/form/test/qa-functional/data/SampleDesktopApplication/nbproject/project.properties index b068baeac..52f0679b4 100644 --- a/form/test/qa-functional/data/SampleDesktopApplication/nbproject/project.properties +++ b/form/test/qa-functional/data/SampleDesktopApplication/nbproject/project.properties @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + application.desc=A simple java desktop application based on Swing Application Framework application.homepage=http://appframework.dev.java.net application.title=Basic Application Example diff --git a/form/test/qa-functional/data/SampleDesktopApplication/nbproject/project.xml b/form/test/qa-functional/data/SampleDesktopApplication/nbproject/project.xml index 1c3dd211d..38371ba4b 100644 --- a/form/test/qa-functional/data/SampleDesktopApplication/nbproject/project.xml +++ b/form/test/qa-functional/data/SampleDesktopApplication/nbproject/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.java.j2seproject</type> <configuration> diff --git a/form/test/qa-functional/data/SampleDesktopApplication/src/META-INF/services/org.jdesktop.application.Application b/form/test/qa-functional/data/SampleDesktopApplication/src/META-INF/services/org.jdesktop.application.Application index 299564290..aafb3473e 100644 --- a/form/test/qa-functional/data/SampleDesktopApplication/src/META-INF/services/org.jdesktop.application.Application +++ b/form/test/qa-functional/data/SampleDesktopApplication/src/META-INF/services/org.jdesktop.application.Application @@ -1 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# sampledesktopapplication.SampleDesktopApplication \ No newline at end of file diff --git a/form/test/qa-functional/data/SampleProject/build.xml b/form/test/qa-functional/data/SampleProject/build.xml index 5c96d3588..9b0608d82 100644 --- a/form/test/qa-functional/data/SampleProject/build.xml +++ b/form/test/qa-functional/data/SampleProject/build.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- You may freely edit this file. See commented blocks below for --> <!-- some examples of how to customize the build. --> <!-- (If you delete it and reopen the project it will be recreated.) --> diff --git a/form/test/qa-functional/data/SampleProject/nbproject/project.properties b/form/test/qa-functional/data/SampleProject/nbproject/project.properties index b581ae8ff..94941a719 100644 --- a/form/test/qa-functional/data/SampleProject/nbproject/project.properties +++ b/form/test/qa-functional/data/SampleProject/nbproject/project.properties @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + application.args= application.title=SampleProject application.vendor=Admin diff --git a/form/test/qa-functional/data/SampleProject/nbproject/project.xml b/form/test/qa-functional/data/SampleProject/nbproject/project.xml index 228eb21a9..2aea25cb0 100644 --- a/form/test/qa-functional/data/SampleProject/nbproject/project.xml +++ b/form/test/qa-functional/data/SampleProject/nbproject/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.java.j2seproject</type> <configuration> diff --git a/git/l10n.list b/git/l10n.list index 332ee0000..d334849b0 100644 --- a/git/l10n.list +++ b/git/l10n.list @@ -1,2 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# # git/main read global diff --git a/hibernate/src/org/netbeans/modules/hibernate/hqleditor/ui/Bundle.properties b/hibernate/src/org/netbeans/modules/hibernate/hqleditor/ui/Bundle.properties index ca06806e6..b5344ae61 100644 --- a/hibernate/src/org/netbeans/modules/hibernate/hqleditor/ui/Bundle.properties +++ b/hibernate/src/org/netbeans/modules/hibernate/hqleditor/ui/Bundle.properties @@ -1,43 +1,19 @@ - -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -# Copyright 2010 Oracle and/or its affiliates. All rights reserved. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. - -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" - -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. - -# Contributor(s): - -# Portions Copyrighted 2008 Sun Microsystems, Inc. +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. CTL_HQLEditorAction=Run HQL Query diff --git a/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateConfig.xml b/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateConfig.xml index b25bcd301..f71fcae93 100644 --- a/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateConfig.xml +++ b/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateConfig.xml @@ -1,24 +1,4 @@ <?xml version='1.0' encoding='utf-8'?> -<!-- - - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. - ---> <!DOCTYPE hibernate-configuration PUBLIC "-//Hibernate/Hibernate Configuration DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> diff --git a/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateMapping.xml b/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateMapping.xml index 29a322b04..2879d649b 100644 --- a/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateMapping.xml +++ b/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateMapping.xml @@ -1,25 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- - - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. - ---> - <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> diff --git a/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateReveng.xml b/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateReveng.xml index 209d83dca..8e0e4fbec 100644 --- a/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateReveng.xml +++ b/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateReveng.xml @@ -1,25 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- - - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. - ---> - <!DOCTYPE hibernate-reverse-engineering PUBLIC "-//Hibernate/Hibernate Reverse Engineering DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-reverse-engineering-3.0.dtd"> diff --git a/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateUtil.javax b/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateUtil.javax index 67bbe3475..39a626402 100644 --- a/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateUtil.javax +++ b/hibernate/src/org/netbeans/modules/hibernate/resources/HibernateUtil.javax @@ -1,21 +1,3 @@ -<#-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> <#assign licenseLast = " */"> diff --git a/html.custom/test/unit/data/testfiles/testHtmlApp/nbproject/project.properties b/html.custom/test/unit/data/testfiles/testHtmlApp/nbproject/project.properties index a70981bcc..2852f7ca4 100644 --- a/html.custom/test/unit/data/testfiles/testHtmlApp/nbproject/project.properties +++ b/html.custom/test/unit/data/testfiles/testHtmlApp/nbproject/project.properties @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + auxiliary.org-netbeans-modules-web-clientproject-api.js_2e_libs_2e_folder=js/libs config.folder=${file.reference.testHtmlApp-config} file.reference.testHtmlApp-config=config diff --git a/html.custom/test/unit/data/testfiles/testHtmlApp/nbproject/project.xml b/html.custom/test/unit/data/testfiles/testHtmlApp/nbproject/project.xml index 1c221a027..74bfd4496 100644 --- a/html.custom/test/unit/data/testfiles/testHtmlApp/nbproject/project.xml +++ b/html.custom/test/unit/data/testfiles/testHtmlApp/nbproject/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.web.clientproject</type> <configuration> diff --git a/html.lexer/src/org/netbeans/lib/html/lexer/HtmlElements.java b/html.lexer/src/org/netbeans/lib/html/lexer/HtmlElements.java index 54a2ee806..d949c2888 100644 --- a/html.lexer/src/org/netbeans/lib/html/lexer/HtmlElements.java +++ b/html.lexer/src/org/netbeans/lib/html/lexer/HtmlElements.java @@ -1,45 +1,20 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General private License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * Contributor(s): - * - * The Original Software is NetBeans. The Initial Developer of the Original - * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun - * Microsystems, Inc. All Rights Reserved. - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.netbeans.lib.html.lexer; diff --git a/html.validation/nbproject/project.properties b/html.validation/nbproject/project.properties index 793f73be9..ff894cf8b 100644 --- a/html.validation/nbproject/project.properties +++ b/html.validation/nbproject/project.properties @@ -1,44 +1,19 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. +# http://www.apache.org/licenses/LICENSE-2.0 # -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# partilar file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# Contributor(s): -# -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. file.reference.iri.jar=external/iri.jar file.reference.jing.jar=external/jing.jar diff --git a/html/l10n.list b/html/l10n.list index ec2263f6d..b33745438 100644 --- a/html/l10n.list +++ b/html/l10n.list @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# # diff read global ${l10n-module}/src/org/netbeans/modules/html/**/*.html diff --git a/httpserver/external/binaries-list b/httpserver/external/binaries-list index 8f6e8ff64..7779f43f4 100644 --- a/httpserver/external/binaries-list +++ b/httpserver/external/binaries-list @@ -14,4 +14,4 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7 tomcat-webserver-3.2.jar +FCE6D146C0B03EF115B9AF05FF2976F15308998C tomcat:webserver:3.2.4 diff --git a/httpserver/external/tomcat-webserver-3.2-license.txt b/httpserver/external/tomcat-webserver-3.2-license.txt deleted file mode 100644 index 06346338c..000000000 --- a/httpserver/external/tomcat-webserver-3.2-license.txt +++ /dev/null @@ -1,58 +0,0 @@ -Name: Apache Tomcat -Version: 3.2 -License: Apache-1.1 -OSR: 11714 -Description: Tomcat HTTP server (internal) -Origin: http://tomcat.apache.org - -The Apache Software License, Version 1.1 - -Copyright (c) 2000 The Apache Software Foundation. All rights -reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - -3. The end-user documentation included with the redistribution, - if any, must include the following acknowledgment: - "This product includes software developed by the - Apache Software Foundation (http://www.apache.org/)." - Alternately, this acknowledgment may appear in the software itself, - if and wherever such third-party acknowledgments normally appear. - -4. The names "Apache" and "Apache Software Foundation" must - not be used to endorse or promote products derived from this - software without prior written permission. For written - permission, please contact apache@apache.org. - -5. Products derived from this software may not be called "Apache", - nor may "Apache" appear in their name, without prior written - permission of the Apache Software Foundation. - -THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED -WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR -ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT -OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -SUCH DAMAGE. -==================================================================== - -This software consists of voluntary contributions made by many -individuals on behalf of the Apache Software Foundation. For more -information on the Apache Software Foundation, please see -<http://www.apache.org/>. diff --git a/httpserver/external/webserver-3.2.4-license.txt b/httpserver/external/webserver-3.2.4-license.txt new file mode 100644 index 000000000..dc8c60dcd --- /dev/null +++ b/httpserver/external/webserver-3.2.4-license.txt @@ -0,0 +1,207 @@ +Name: Apache Tomcat +Version: 3.2.4 +License: Apache-2.0 +Description: Tomcat HTTP server (internal) +Origin: http://tomcat.apache.org + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/httpserver/nbproject/project.properties b/httpserver/nbproject/project.properties index ef7ef8456..6aff87b64 100644 --- a/httpserver/nbproject/project.properties +++ b/httpserver/nbproject/project.properties @@ -18,7 +18,7 @@ javac.compilerargs=-Xlint:unchecked javac.source=1.6 spec.version.base=2.37.0 -release.external/tomcat-webserver-3.2.jar=modules/ext/webserver.jar +release.external/webserver-3.2.4.jar=modules/ext/webserver.jar test-unit-sys-prop.xtest.data=${nb_all}/httpserver/test/unit/testfs test.unit.data.dir=${nb_all}/httpserver/test/unit/testfs disable.qa-functional.tests=true diff --git a/httpserver/nbproject/project.xml b/httpserver/nbproject/project.xml index 8dd36d93d..dd4137760 100644 --- a/httpserver/nbproject/project.xml +++ b/httpserver/nbproject/project.xml @@ -78,7 +78,7 @@ <build-prerequisite/> <compile-dependency/> <run-dependency> - <specification-version>7.61</specification-version> + <specification-version>7.61</specification-version> </run-dependency> </dependency> <dependency> @@ -153,7 +153,7 @@ <public-packages/> <class-path-extension> <runtime-relative-path>ext/webserver.jar</runtime-relative-path> - <binary-origin>external/tomcat-webserver-3.2.jar</binary-origin> + <binary-origin>external/webserver-3.2.4.jar</binary-origin> </class-path-extension> </data> </configuration> diff --git a/i18n/l10n.list b/i18n/l10n.list index 1e424f2a4..b14a176ca 100644 --- a/i18n/l10n.list +++ b/i18n/l10n.list @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# # diff read global ${l10n-module}/src/org/netbeans/modules/i18n/*.gif diff --git a/i18n/test/qa-functional/data/projects/ProjectI18n/build.xml b/i18n/test/qa-functional/data/projects/ProjectI18n/build.xml index 8626628db..3ba200f45 100644 --- a/i18n/test/qa-functional/data/projects/ProjectI18n/build.xml +++ b/i18n/test/qa-functional/data/projects/ProjectI18n/build.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- You may freely edit this file. See commented blocks below for --> <!-- some examples of how to customize the build. --> <!-- (If you delete it and reopen the project it will be recreated.) --> diff --git a/i18n/test/qa-functional/data/projects/ProjectI18n/nbproject/project.properties b/i18n/test/qa-functional/data/projects/ProjectI18n/nbproject/project.properties index 392f84414..e68c81885 100644 --- a/i18n/test/qa-functional/data/projects/ProjectI18n/nbproject/project.properties +++ b/i18n/test/qa-functional/data/projects/ProjectI18n/nbproject/project.properties @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + build.classes.dir=${build.dir}/classes build.classes.excludes=**/*.java,**/*.form # This directory is removed when the project is cleaned: diff --git a/i18n/test/qa-functional/data/projects/ProjectI18n/nbproject/project.xml b/i18n/test/qa-functional/data/projects/ProjectI18n/nbproject/project.xml index 779d1c2ee..6070e8a61 100644 --- a/i18n/test/qa-functional/data/projects/ProjectI18n/nbproject/project.xml +++ b/i18n/test/qa-functional/data/projects/ProjectI18n/nbproject/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.java.j2seproject</type> <configuration> diff --git a/ide.branding/l10n.list b/ide.branding/l10n.list index 15ee832cd..330a5a540 100644 --- a/ide.branding/l10n.list +++ b/ide.branding/l10n.list @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ide.branding/release-toplevel/CREDITS.html ide.branding/release-toplevel/README.html ide.branding/release/shortcuts.pdf diff --git a/ide.kit/release/VERSION.txt b/ide.kit/release/VERSION.txt index b18c5079e..90ff0839b 100644 --- a/ide.kit/release/VERSION.txt +++ b/ide.kit/release/VERSION.txt @@ -1,43 +1,18 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. +# http://www.apache.org/licenses/LICENSE-2.0 # -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# Contributor(s): -# -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. # cluster incompatible release version 22 diff --git a/ide.kit/test/qa-functional/data/BlacklistedClassesHandlerConfig.xml b/ide.kit/test/qa-functional/data/BlacklistedClassesHandlerConfig.xml index 8a89fd61c..bd329fdd8 100644 --- a/ide.kit/test/qa-functional/data/BlacklistedClassesHandlerConfig.xml +++ b/ide.kit/test/qa-functional/data/BlacklistedClassesHandlerConfig.xml @@ -1,5 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- Document : BlacklistedClassesHandlerConfig.xml Author : mrkam@netbeans.og diff --git a/ide.kit/test/qa-functional/data/SampleProject/nbproject/project.properties b/ide.kit/test/qa-functional/data/SampleProject/nbproject/project.properties index c70650afa..aa0b38dd2 100644 --- a/ide.kit/test/qa-functional/data/SampleProject/nbproject/project.properties +++ b/ide.kit/test/qa-functional/data/SampleProject/nbproject/project.properties @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + application.args= build.classes.dir=${build.dir}/classes build.classes.excludes=**/*.java,**/*.form diff --git a/ide.kit/test/qa-functional/data/SampleProject/nbproject/project.xml b/ide.kit/test/qa-functional/data/SampleProject/nbproject/project.xml index 4c02c66d1..acc153caa 100644 --- a/ide.kit/test/qa-functional/data/SampleProject/nbproject/project.xml +++ b/ide.kit/test/qa-functional/data/SampleProject/nbproject/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.java.j2seproject</type> <configuration> diff --git a/ide.kit/test/qa-functional/data/kits.properties b/ide.kit/test/qa-functional/data/kits.properties index f3a51d79a..f83c15abd 100644 --- a/ide.kit/test/qa-functional/data/kits.properties +++ b/ide.kit/test/qa-functional/data/kits.properties @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + # --- BASE --- # org.netbeans.modules.mercurial=base org.netbeans.modules.ide.kit=base diff --git a/image/l10n.list b/image/l10n.list index cbae24c22..207acdfde 100644 --- a/image/l10n.list +++ b/image/l10n.list @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# # diff read global ${l10n-module}/src/**/image/*.gif diff --git a/j2ee.core.utilities/test/unit/data/JavaApp/build.xml b/j2ee.core.utilities/test/unit/data/JavaApp/build.xml index d7f3d7c3b..b3fb4819a 100644 --- a/j2ee.core.utilities/test/unit/data/JavaApp/build.xml +++ b/j2ee.core.utilities/test/unit/data/JavaApp/build.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- You may freely edit this file. See commented blocks below for --> <!-- some examples of how to customize the build. --> <!-- (If you delete it and reopen the project it will be recreated.) --> diff --git a/j2ee.core.utilities/test/unit/data/JavaApp/nbproject/project.properties b/j2ee.core.utilities/test/unit/data/JavaApp/nbproject/project.properties index 3113782ef..1b4fcecff 100644 --- a/j2ee.core.utilities/test/unit/data/JavaApp/nbproject/project.properties +++ b/j2ee.core.utilities/test/unit/data/JavaApp/nbproject/project.properties @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + build.classes.dir=${build.dir}/classes build.classes.excludes=**/*.java,**/*.form # This directory is removed when the project is cleaned: diff --git a/j2ee.metadata/test/unit/data/projects/JavaApplication1/build.xml b/j2ee.metadata/test/unit/data/projects/JavaApplication1/build.xml index 716370b61..0d2eb1c4a 100644 --- a/j2ee.metadata/test/unit/data/projects/JavaApplication1/build.xml +++ b/j2ee.metadata/test/unit/data/projects/JavaApplication1/build.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- You may freely edit this file. See commented blocks below for --> <!-- some examples of how to customize the build. --> <!-- (If you delete it and reopen the project it will be recreated.) --> diff --git a/j2ee.metadata/test/unit/data/projects/JavaApplication1/nbproject/project.properties b/j2ee.metadata/test/unit/data/projects/JavaApplication1/nbproject/project.properties index 4fe307281..91b9c656d 100644 --- a/j2ee.metadata/test/unit/data/projects/JavaApplication1/nbproject/project.properties +++ b/j2ee.metadata/test/unit/data/projects/JavaApplication1/nbproject/project.properties @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + application.args= build.classes.dir=${build.dir}/classes build.classes.excludes=**/*.java,**/*.form diff --git a/j2ee.persistence/build.xml b/j2ee.persistence/build.xml index bf05c8392..a61dc9bb6 100644 --- a/j2ee.persistence/build.xml +++ b/j2ee.persistence/build.xml @@ -22,10 +22,5 @@ <project basedir="." default="netbeans" name="j2ee.persistence"> <import file="../nbbuild/templates/projectized.xml"/> - <property name="persistence.resources.dir" value="./src/org/netbeans/modules/j2ee/persistence/dd/resources/"/> - - <target name="build-init" depends="projectized.build-init"> - <unzip src="external/j2ee.persistence-external-resources.zip" dest="${persistence.resources.dir}"/> - </target> </project> diff --git a/j2ee.persistence/external/j2ee.persistence-external-resources/orm_1_0.xsd b/j2ee.persistence/external/j2ee.persistence-external-resources/orm_1_0.xsd new file mode 100644 index 000000000..0d65647c9 --- /dev/null +++ b/j2ee.persistence/external/j2ee.persistence-external-resources/orm_1_0.xsd @@ -0,0 +1,1564 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Java Persistence API object-relational mapping file schema --> +<xsd:schema targetNamespace="http://java.sun.com/xml/ns/persistence/orm" + xmlns:orm="http://java.sun.com/xml/ns/persistence/orm" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + elementFormDefault="qualified" + attributeFormDefault="unqualified" + version="1.0"> + + <xsd:annotation> + <xsd:documentation> + @(#)orm_1_0.xsd 1.0 Feb 14 2006 + </xsd:documentation> + </xsd:annotation> + + <xsd:annotation> + <xsd:documentation> + + DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + + Copyright 2005-2010 Oracle and/or its affiliates. All rights reserved. + +Oracle and Java are registered trademarks of Oracle and/or its affiliates. +Other names may be trademarks of their respective owners. + + The contents of this file are subject to the terms of either the + GNU General Public License Version 2 only ("GPL") or the Common + Development and Distribution License("CDDL") (collectively, the + "License"). You may not use this file except in compliance with + the License. You can obtain a copy of the License at + https://glassfish.dev.java.net/public/CDDL+GPL.html or + glassfish/bootstrap/legal/LICENSE.txt. See the License for the + specific language governing permissions and limitations under the + License. + + When distributing the software, include this License Header + Notice in each file and include the License file at + glassfish/bootstrap/legal/LICENSE.txt. Sun designates this + particular file as subject to the "Classpath" exception as + provided by Oracle in the GPL Version 2 section of the License file + that accompanied this code. If applicable, add the following + below the License Header, with the fields enclosed by brackets [] + replaced by your own identifying information: + "Portions Copyrighted [year] [name of copyright owner]" + + Contributor(s): + + If you wish your version of this file to be governed by only the + CDDL or only the GPL Version 2, indicate your decision by adding + "[Contributor] elects to include this software in this + distribution under the [CDDL or GPL Version 2] license." If you + don't indicate a single choice of license, a recipient has the + option to distribute your version of this file under either the + CDDL, the GPL Version 2 or to extend the choice of license to its + licensees as provided above. However, if you add GPL Version 2 + code and therefore, elected the GPL Version 2 license, then the + option applies only if the new code is made subject to such + option by the copyright holder. + + </xsd:documentation> + </xsd:annotation> + + <xsd:annotation> + <xsd:documentation><![CDATA[ + + This is the XML Schema for the persistence object-relational + mapping file. + The file may be named "META-INF/orm.xml" in the persistence + archive or it may be named some other name which would be + used to locate the file as resource on the classpath. + + ]]></xsd:documentation> + </xsd:annotation> + + <xsd:complexType name="emptyType"/> + + <xsd:simpleType name="versionType"> + <xsd:restriction base="xsd:token"> + <xsd:pattern value="[0-9]+(\.[0-9]+)*"/> + </xsd:restriction> + </xsd:simpleType> + + <!-- **************************************************** --> + + <xsd:element name="entity-mappings"> + <xsd:complexType> + <xsd:annotation> + <xsd:documentation> + + The entity-mappings element is the root element of an mapping + file. It contains the following four types of elements: + + 1. The persistence-unit-metadata element contains metadata + for the entire persistence unit. It is undefined if this element + occurs in multiple mapping files within the same persistence unit. + + 2. The package, schema, catalog and access elements apply to all of + the entity, mapped-superclass and embeddable elements defined in + the same file in which they occur. + + 3. The sequence-generator, table-generator, named-query, + named-native-query and sql-result-set-mapping elements are global + to the persistence unit. It is undefined to have more than one + sequence-generator or table-generator of the same name in the same + or different mapping files in a persistence unit. It is also + undefined to have more than one named-query or named-native-query + of the same name in the same or different mapping files in a + persistence unit. + + 4. The entity, mapped-superclass and embeddable elements each define + the mapping information for a managed persistent class. The mapping + information contained in these elements may be complete or it may + be partial. + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" + minOccurs="0"/> + <xsd:element name="persistence-unit-metadata" + type="orm:persistence-unit-metadata" + minOccurs="0"/> + <xsd:element name="package" type="xsd:string" + minOccurs="0"/> + <xsd:element name="schema" type="xsd:string" + minOccurs="0"/> + <xsd:element name="catalog" type="xsd:string" + minOccurs="0"/> + <xsd:element name="access" type="orm:access-type" + minOccurs="0"/> + <xsd:element name="sequence-generator" type="orm:sequence-generator" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="table-generator" type="orm:table-generator" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="named-query" type="orm:named-query" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="named-native-query" type="orm:named-native-query" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="sql-result-set-mapping" + type="orm:sql-result-set-mapping" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="mapped-superclass" type="orm:mapped-superclass" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="entity" type="orm:entity" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="embeddable" type="orm:embeddable" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="version" type="orm:versionType" + fixed="1.0" use="required"/> + </xsd:complexType> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:complexType name="persistence-unit-metadata"> + <xsd:annotation> + <xsd:documentation> + + Metadata that applies to the persistence unit and not just to + the mapping file in which it is contained. + + If the xml-mapping-metadata-complete element is specified then + the complete set of mapping metadata for the persistence unit + is contained in the XML mapping files for the persistence unit. + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="xml-mapping-metadata-complete" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="persistence-unit-defaults" + type="orm:persistence-unit-defaults" + minOccurs="0"/> + </xsd:sequence> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="persistence-unit-defaults"> + <xsd:annotation> + <xsd:documentation> + + These defaults are applied to the persistence unit as a whole + unless they are overridden by local annotation or XML + element settings. + + schema - Used as the schema for all tables or secondary tables + that apply to the persistence unit + catalog - Used as the catalog for all tables or secondary tables + that apply to the persistence unit + access - Used as the access type for all managed classes in + the persistence unit + cascade-persist - Adds cascade-persist to the set of cascade options + in entity relationships of the persistence unit + entity-listeners - List of default entity listeners to be invoked + on each entity in the persistence unit. + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="schema" type="xsd:string" + minOccurs="0"/> + <xsd:element name="catalog" type="xsd:string" + minOccurs="0"/> + <xsd:element name="access" type="orm:access-type" + minOccurs="0"/> + <xsd:element name="cascade-persist" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="entity-listeners" type="orm:entity-listeners" + minOccurs="0"/> + </xsd:sequence> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="entity"> + <xsd:annotation> + <xsd:documentation> + + Defines the settings and mappings for an entity. Is allowed to be + sparsely populated and used in conjunction with the annotations. + Alternatively, the metadata-complete attribute can be used to + indicate that no annotations on the entity class (and its fields + or properties) are to be processed. If this is the case then + the defaulting rules for the entity and its subelements will + be recursively applied. + + @Target(TYPE) @Retention(RUNTIME) + public @interface Entity { + String name() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:element name="table" type="orm:table" + minOccurs="0"/> + <xsd:element name="secondary-table" type="orm:secondary-table" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="primary-key-join-column" + type="orm:primary-key-join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="id-class" type="orm:id-class" minOccurs="0"/> + <xsd:element name="inheritance" type="orm:inheritance" minOccurs="0"/> + <xsd:element name="discriminator-value" type="orm:discriminator-value" + minOccurs="0"/> + <xsd:element name="discriminator-column" + type="orm:discriminator-column" + minOccurs="0"/> + <xsd:element name="sequence-generator" type="orm:sequence-generator" + minOccurs="0"/> + <xsd:element name="table-generator" type="orm:table-generator" + minOccurs="0"/> + <xsd:element name="named-query" type="orm:named-query" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="named-native-query" type="orm:named-native-query" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="sql-result-set-mapping" + type="orm:sql-result-set-mapping" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="exclude-default-listeners" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="exclude-superclass-listeners" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="entity-listeners" type="orm:entity-listeners" + minOccurs="0"/> + <xsd:element name="pre-persist" type="orm:pre-persist" minOccurs="0"/> + <xsd:element name="post-persist" type="orm:post-persist" + minOccurs="0"/> + <xsd:element name="pre-remove" type="orm:pre-remove" minOccurs="0"/> + <xsd:element name="post-remove" type="orm:post-remove" minOccurs="0"/> + <xsd:element name="pre-update" type="orm:pre-update" minOccurs="0"/> + <xsd:element name="post-update" type="orm:post-update" minOccurs="0"/> + <xsd:element name="post-load" type="orm:post-load" minOccurs="0"/> + <xsd:element name="attribute-override" type="orm:attribute-override" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="association-override" + type="orm:association-override" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="attributes" type="orm:attributes" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="class" type="xsd:string" use="required"/> + <xsd:attribute name="access" type="orm:access-type"/> + <xsd:attribute name="metadata-complete" type="xsd:boolean"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="attributes"> + <xsd:annotation> + <xsd:documentation> + + This element contains the entity field or property mappings. + It may be sparsely populated to include only a subset of the + fields or properties. If metadata-complete for the entity is true + then the remainder of the attributes will be defaulted according + to the default rules. + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:choice> + <xsd:element name="id" type="orm:id" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="embedded-id" type="orm:embedded-id" + minOccurs="0"/> + </xsd:choice> + <xsd:element name="basic" type="orm:basic" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="version" type="orm:version" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="many-to-one" type="orm:many-to-one" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="one-to-many" type="orm:one-to-many" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="one-to-one" type="orm:one-to-one" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="many-to-many" type="orm:many-to-many" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="embedded" type="orm:embedded" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="transient" type="orm:transient" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:simpleType name="access-type"> + <xsd:annotation> + <xsd:documentation> + + This element determines how the persistence provider accesses the + state of an entity or embedded object. + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="PROPERTY"/> + <xsd:enumeration value="FIELD"/> + </xsd:restriction> + </xsd:simpleType> + + <!-- **************************************************** --> + + <xsd:complexType name="entity-listeners"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface EntityListeners { + Class[] value(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="entity-listener" type="orm:entity-listener" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="entity-listener"> + <xsd:annotation> + <xsd:documentation> + + Defines an entity listener to be invoked at lifecycle events + for the entities that list this listener. + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="pre-persist" type="orm:pre-persist" minOccurs="0"/> + <xsd:element name="post-persist" type="orm:post-persist" + minOccurs="0"/> + <xsd:element name="pre-remove" type="orm:pre-remove" minOccurs="0"/> + <xsd:element name="post-remove" type="orm:post-remove" minOccurs="0"/> + <xsd:element name="pre-update" type="orm:pre-update" minOccurs="0"/> + <xsd:element name="post-update" type="orm:post-update" minOccurs="0"/> + <xsd:element name="post-load" type="orm:post-load" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="class" type="xsd:string" use="required"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="pre-persist"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PrePersist {} + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="method-name" type="xsd:string" use="required"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="post-persist"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PostPersist {} + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="method-name" type="xsd:string" use="required"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="pre-remove"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PreRemove {} + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="method-name" type="xsd:string" use="required"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="post-remove"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PostRemove {} + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="method-name" type="xsd:string" use="required"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="pre-update"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PreUpdate {} + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="method-name" type="xsd:string" use="required"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="post-update"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PostUpdate {} + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="method-name" type="xsd:string" use="required"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="post-load"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PostLoad {} + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="method-name" type="xsd:string" use="required"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="query-hint"> + <xsd:annotation> + <xsd:documentation> + + @Target({}) @Retention(RUNTIME) + public @interface QueryHint { + String name(); + String value(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="value" type="xsd:string" use="required"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="named-query"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface NamedQuery { + String name(); + String query(); + QueryHint[] hints() default {}; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="query" type="xsd:string"/> + <xsd:element name="hint" type="orm:query-hint" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="named-native-query"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface NamedNativeQuery { + String name(); + String query(); + QueryHint[] hints() default {}; + Class resultClass() default void.class; + String resultSetMapping() default ""; //named SqlResultSetMapping + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="query" type="xsd:string"/> + <xsd:element name="hint" type="orm:query-hint" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="result-class" type="xsd:string"/> + <xsd:attribute name="result-set-mapping" type="xsd:string"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="sql-result-set-mapping"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface SqlResultSetMapping { + String name(); + EntityResult[] entities() default {}; + ColumnResult[] columns() default {}; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="entity-result" type="orm:entity-result" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="column-result" type="orm:column-result" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="entity-result"> + <xsd:annotation> + <xsd:documentation> + + @Target({}) @Retention(RUNTIME) + public @interface EntityResult { + Class entityClass(); + FieldResult[] fields() default {}; + String discriminatorColumn() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="field-result" type="orm:field-result" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="entity-class" type="xsd:string" use="required"/> + <xsd:attribute name="discriminator-column" type="xsd:string"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="field-result"> + <xsd:annotation> + <xsd:documentation> + + @Target({}) @Retention(RUNTIME) + public @interface FieldResult { + String name(); + String column(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="column" type="xsd:string" use="required"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="column-result"> + <xsd:annotation> + <xsd:documentation> + + @Target({}) @Retention(RUNTIME) + public @interface ColumnResult { + String name(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string" use="required"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="table"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface Table { + String name() default ""; + String catalog() default ""; + String schema() default ""; + UniqueConstraint[] uniqueConstraints() default {}; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="unique-constraint" type="orm:unique-constraint" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="catalog" type="xsd:string"/> + <xsd:attribute name="schema" type="xsd:string"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="secondary-table"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface SecondaryTable { + String name(); + String catalog() default ""; + String schema() default ""; + PrimaryKeyJoinColumn[] pkJoinColumns() default {}; + UniqueConstraint[] uniqueConstraints() default {}; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="primary-key-join-column" + type="orm:primary-key-join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="unique-constraint" type="orm:unique-constraint" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="catalog" type="xsd:string"/> + <xsd:attribute name="schema" type="xsd:string"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="unique-constraint"> + <xsd:annotation> + <xsd:documentation> + + @Target({}) @Retention(RUNTIME) + public @interface UniqueConstraint { + String[] columnNames(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="column-name" type="xsd:string" + maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="column"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Column { + String name() default ""; + boolean unique() default false; + boolean nullable() default true; + boolean insertable() default true; + boolean updatable() default true; + String columnDefinition() default ""; + String table() default ""; + int length() default 255; + int precision() default 0; // decimal precision + int scale() default 0; // decimal scale + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="unique" type="xsd:boolean"/> + <xsd:attribute name="nullable" type="xsd:boolean"/> + <xsd:attribute name="insertable" type="xsd:boolean"/> + <xsd:attribute name="updatable" type="xsd:boolean"/> + <xsd:attribute name="column-definition" type="xsd:string"/> + <xsd:attribute name="table" type="xsd:string"/> + <xsd:attribute name="length" type="xsd:int"/> + <xsd:attribute name="precision" type="xsd:int"/> + <xsd:attribute name="scale" type="xsd:int"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="join-column"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface JoinColumn { + String name() default ""; + String referencedColumnName() default ""; + boolean unique() default false; + boolean nullable() default true; + boolean insertable() default true; + boolean updatable() default true; + String columnDefinition() default ""; + String table() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="referenced-column-name" type="xsd:string"/> + <xsd:attribute name="unique" type="xsd:boolean"/> + <xsd:attribute name="nullable" type="xsd:boolean"/> + <xsd:attribute name="insertable" type="xsd:boolean"/> + <xsd:attribute name="updatable" type="xsd:boolean"/> + <xsd:attribute name="column-definition" type="xsd:string"/> + <xsd:attribute name="table" type="xsd:string"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:simpleType name="generation-type"> + <xsd:annotation> + <xsd:documentation> + + public enum GenerationType { TABLE, SEQUENCE, IDENTITY, AUTO }; + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="TABLE"/> + <xsd:enumeration value="SEQUENCE"/> + <xsd:enumeration value="IDENTITY"/> + <xsd:enumeration value="AUTO"/> + </xsd:restriction> + </xsd:simpleType> + + <!-- **************************************************** --> + + <xsd:complexType name="attribute-override"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME) + public @interface AttributeOverride { + String name(); + Column column(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="column" type="orm:column"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="association-override"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME) + public @interface AssociationOverride { + String name(); + JoinColumn[] joinColumns(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="join-column" type="orm:join-column" + maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="id-class"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface IdClass { + Class value(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="class" type="xsd:string" use="required"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="id"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Id {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="column" type="orm:column" + minOccurs="0"/> + <xsd:element name="generated-value" type="orm:generated-value" + minOccurs="0"/> + <xsd:element name="temporal" type="orm:temporal" + minOccurs="0"/> + <xsd:element name="table-generator" type="orm:table-generator" + minOccurs="0"/> + <xsd:element name="sequence-generator" type="orm:sequence-generator" + minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="embedded-id"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface EmbeddedId {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="attribute-override" type="orm:attribute-override" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="transient"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Transient {} + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string" use="required"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="version"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Version {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="column" type="orm:column" minOccurs="0"/> + <xsd:element name="temporal" type="orm:temporal" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="basic"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Basic { + FetchType fetch() default EAGER; + boolean optional() default true; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="column" type="orm:column" minOccurs="0"/> + <xsd:choice> + <xsd:element name="lob" type="orm:lob" minOccurs="0"/> + <xsd:element name="temporal" type="orm:temporal" minOccurs="0"/> + <xsd:element name="enumerated" type="orm:enumerated" minOccurs="0"/> + </xsd:choice> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="fetch" type="orm:fetch-type"/> + <xsd:attribute name="optional" type="xsd:boolean"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:simpleType name="fetch-type"> + <xsd:annotation> + <xsd:documentation> + + public enum FetchType { LAZY, EAGER }; + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="LAZY"/> + <xsd:enumeration value="EAGER"/> + </xsd:restriction> + </xsd:simpleType> + + <!-- **************************************************** --> + + <xsd:complexType name="lob"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Lob {} + + </xsd:documentation> + </xsd:annotation> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:simpleType name="temporal"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Temporal { + TemporalType value(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="orm:temporal-type"/> + </xsd:simpleType> + + <!-- **************************************************** --> + + <xsd:simpleType name="temporal-type"> + <xsd:annotation> + <xsd:documentation> + + public enum TemporalType { + DATE, // java.sql.Date + TIME, // java.sql.Time + TIMESTAMP // java.sql.Timestamp + } + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="DATE"/> + <xsd:enumeration value="TIME"/> + <xsd:enumeration value="TIMESTAMP"/> + </xsd:restriction> + </xsd:simpleType> + + <!-- **************************************************** --> + + <xsd:simpleType name="enumerated"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Enumerated { + EnumType value() default ORDINAL; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="orm:enum-type"/> + </xsd:simpleType> + + <!-- **************************************************** --> + + <xsd:simpleType name="enum-type"> + <xsd:annotation> + <xsd:documentation> + + public enum EnumType { + ORDINAL, + STRING + } + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="ORDINAL"/> + <xsd:enumeration value="STRING"/> + </xsd:restriction> + </xsd:simpleType> + + <!-- **************************************************** --> + + <xsd:complexType name="many-to-one"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface ManyToOne { + Class targetEntity() default void.class; + CascadeType[] cascade() default {}; + FetchType fetch() default EAGER; + boolean optional() default true; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:choice> + <xsd:element name="join-column" type="orm:join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="join-table" type="orm:join-table" + minOccurs="0"/> + </xsd:choice> + <xsd:element name="cascade" type="orm:cascade-type" + minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="target-entity" type="xsd:string"/> + <xsd:attribute name="fetch" type="orm:fetch-type"/> + <xsd:attribute name="optional" type="xsd:boolean"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="cascade-type"> + <xsd:annotation> + <xsd:documentation> + + public enum CascadeType { ALL, PERSIST, MERGE, REMOVE, REFRESH}; + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="cascade-all" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="cascade-persist" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="cascade-merge" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="cascade-remove" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="cascade-refresh" type="orm:emptyType" + minOccurs="0"/> + </xsd:sequence> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="one-to-one"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface OneToOne { + Class targetEntity() default void.class; + CascadeType[] cascade() default {}; + FetchType fetch() default EAGER; + boolean optional() default true; + String mappedBy() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:choice> + <xsd:element name="primary-key-join-column" + type="orm:primary-key-join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="join-column" type="orm:join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="join-table" type="orm:join-table" + minOccurs="0"/> + </xsd:choice> + <xsd:element name="cascade" type="orm:cascade-type" + minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="target-entity" type="xsd:string"/> + <xsd:attribute name="fetch" type="orm:fetch-type"/> + <xsd:attribute name="optional" type="xsd:boolean"/> + <xsd:attribute name="mapped-by" type="xsd:string"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="one-to-many"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface OneToMany { + Class targetEntity() default void.class; + CascadeType[] cascade() default {}; + FetchType fetch() default LAZY; + String mappedBy() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="order-by" type="orm:order-by" + minOccurs="0"/> + <xsd:element name="map-key" type="orm:map-key" + minOccurs="0"/> + <xsd:choice> + <xsd:element name="join-table" type="orm:join-table" + minOccurs="0"/> + <xsd:element name="join-column" type="orm:join-column" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:choice> + <xsd:element name="cascade" type="orm:cascade-type" + minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="target-entity" type="xsd:string"/> + <xsd:attribute name="fetch" type="orm:fetch-type"/> + <xsd:attribute name="mapped-by" type="xsd:string"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="join-table"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface JoinTable { + String name() default ""; + String catalog() default ""; + String schema() default ""; + JoinColumn[] joinColumns() default {}; + JoinColumn[] inverseJoinColumns() default {}; + UniqueConstraint[] uniqueConstraints() default {}; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="join-column" type="orm:join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="inverse-join-column" type="orm:join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="unique-constraint" type="orm:unique-constraint" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="catalog" type="xsd:string"/> + <xsd:attribute name="schema" type="xsd:string"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="many-to-many"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface ManyToMany { + Class targetEntity() default void.class; + CascadeType[] cascade() default {}; + FetchType fetch() default LAZY; + String mappedBy() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="order-by" type="orm:order-by" + minOccurs="0"/> + <xsd:element name="map-key" type="orm:map-key" + minOccurs="0"/> + <xsd:element name="join-table" type="orm:join-table" + minOccurs="0"/> + <xsd:element name="cascade" type="orm:cascade-type" + minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="target-entity" type="xsd:string"/> + <xsd:attribute name="fetch" type="orm:fetch-type"/> + <xsd:attribute name="mapped-by" type="xsd:string"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="generated-value"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface GeneratedValue { + GenerationType strategy() default AUTO; + String generator() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="strategy" type="orm:generation-type"/> + <xsd:attribute name="generator" type="xsd:string"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="map-key"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface MapKey { + String name() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:simpleType name="order-by"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface OrderBy { + String value() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:string"/> + </xsd:simpleType> + + <!-- **************************************************** --> + + <xsd:complexType name="inheritance"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface Inheritance { + InheritanceType strategy() default SINGLE_TABLE; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="strategy" type="orm:inheritance-type"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:simpleType name="inheritance-type"> + <xsd:annotation> + <xsd:documentation> + + public enum InheritanceType + { SINGLE_TABLE, JOINED, TABLE_PER_CLASS}; + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="SINGLE_TABLE"/> + <xsd:enumeration value="JOINED"/> + <xsd:enumeration value="TABLE_PER_CLASS"/> + </xsd:restriction> + </xsd:simpleType> + + <!-- **************************************************** --> + + <xsd:simpleType name="discriminator-value"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface DiscriminatorValue { + String value(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:string"/> + </xsd:simpleType> + + <!-- **************************************************** --> + + <xsd:simpleType name="discriminator-type"> + <xsd:annotation> + <xsd:documentation> + + public enum DiscriminatorType { STRING, CHAR, INTEGER }; + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="STRING"/> + <xsd:enumeration value="CHAR"/> + <xsd:enumeration value="INTEGER"/> + </xsd:restriction> + </xsd:simpleType> + + <!-- **************************************************** --> + + <xsd:complexType name="primary-key-join-column"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME) + public @interface PrimaryKeyJoinColumn { + String name() default ""; + String referencedColumnName() default ""; + String columnDefinition() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="referenced-column-name" type="xsd:string"/> + <xsd:attribute name="column-definition" type="xsd:string"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="discriminator-column"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface DiscriminatorColumn { + String name() default "DTYPE"; + DiscriminatorType discriminatorType() default STRING; + String columnDefinition() default ""; + int length() default 31; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="discriminator-type" type="orm:discriminator-type"/> + <xsd:attribute name="column-definition" type="xsd:string"/> + <xsd:attribute name="length" type="xsd:int"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="embeddable"> + <xsd:annotation> + <xsd:documentation> + + Defines the settings and mappings for embeddable objects. Is + allowed to be sparsely populated and used in conjunction with + the annotations. Alternatively, the metadata-complete attribute + can be used to indicate that no annotations are to be processed + in the class. If this is the case then the defaulting rules will + be recursively applied. + + @Target({TYPE}) @Retention(RUNTIME) + public @interface Embeddable {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:element name="attributes" type="orm:embeddable-attributes" + minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="class" type="xsd:string" use="required"/> + <xsd:attribute name="access" type="orm:access-type"/> + <xsd:attribute name="metadata-complete" type="xsd:boolean"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="embeddable-attributes"> + <xsd:sequence> + <xsd:element name="basic" type="orm:basic" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="transient" type="orm:transient" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="embedded"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Embedded {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="attribute-override" type="orm:attribute-override" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="mapped-superclass"> + <xsd:annotation> + <xsd:documentation> + + Defines the settings and mappings for a mapped superclass. Is + allowed to be sparsely populated and used in conjunction with + the annotations. Alternatively, the metadata-complete attribute + can be used to indicate that no annotations are to be processed + If this is the case then the defaulting rules will be recursively + applied. + + @Target(TYPE) @Retention(RUNTIME) + public @interface MappedSuperclass{} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:element name="id-class" type="orm:id-class" minOccurs="0"/> + <xsd:element name="exclude-default-listeners" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="exclude-superclass-listeners" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="entity-listeners" type="orm:entity-listeners" + minOccurs="0"/> + <xsd:element name="pre-persist" type="orm:pre-persist" minOccurs="0"/> + <xsd:element name="post-persist" type="orm:post-persist" + minOccurs="0"/> + <xsd:element name="pre-remove" type="orm:pre-remove" minOccurs="0"/> + <xsd:element name="post-remove" type="orm:post-remove" minOccurs="0"/> + <xsd:element name="pre-update" type="orm:pre-update" minOccurs="0"/> + <xsd:element name="post-update" type="orm:post-update" minOccurs="0"/> + <xsd:element name="post-load" type="orm:post-load" minOccurs="0"/> + <xsd:element name="attributes" type="orm:attributes" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="class" type="xsd:string" use="required"/> + <xsd:attribute name="access" type="orm:access-type"/> + <xsd:attribute name="metadata-complete" type="xsd:boolean"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="sequence-generator"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME) + public @interface SequenceGenerator { + String name(); + String sequenceName() default ""; + int initialValue() default 1; + int allocationSize() default 50; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="sequence-name" type="xsd:string"/> + <xsd:attribute name="initial-value" type="xsd:int"/> + <xsd:attribute name="allocation-size" type="xsd:int"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="table-generator"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME) + public @interface TableGenerator { + String name(); + String table() default ""; + String catalog() default ""; + String schema() default ""; + String pkColumnName() default ""; + String valueColumnName() default ""; + String pkColumnValue() default ""; + int initialValue() default 0; + int allocationSize() default 50; + UniqueConstraint[] uniqueConstraints() default {}; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="unique-constraint" type="orm:unique-constraint" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="table" type="xsd:string"/> + <xsd:attribute name="catalog" type="xsd:string"/> + <xsd:attribute name="schema" type="xsd:string"/> + <xsd:attribute name="pk-column-name" type="xsd:string"/> + <xsd:attribute name="value-column-name" type="xsd:string"/> + <xsd:attribute name="pk-column-value" type="xsd:string"/> + <xsd:attribute name="initial-value" type="xsd:int"/> + <xsd:attribute name="allocation-size" type="xsd:int"/> + </xsd:complexType> + +</xsd:schema> + + diff --git a/j2ee.persistence/external/j2ee.persistence-external-resources/orm_2_0.xsd b/j2ee.persistence/external/j2ee.persistence-external-resources/orm_2_0.xsd new file mode 100644 index 000000000..984d48691 --- /dev/null +++ b/j2ee.persistence/external/j2ee.persistence-external-resources/orm_2_0.xsd @@ -0,0 +1,1939 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Java Persistence API object/relational mapping file schema --> +<xsd:schema targetNamespace="http://java.sun.com/xml/ns/persistence/orm" + xmlns:orm="http://java.sun.com/xml/ns/persistence/orm" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + elementFormDefault="qualified" + attributeFormDefault="unqualified" + version="2.0"> + + <xsd:annotation> + <xsd:documentation> + @(#)orm_2_0.xsd 2.0 October 1 2009 + </xsd:documentation> + </xsd:annotation> + + <xsd:annotation> + <xsd:documentation> + + Copyright (c) 2008, 2009 Sun Microsystems. All rights reserved. + + This program and the accompanying materials are made available under the + terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0 + which accompanies this distribution. + The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html + and the Eclipse Distribution License is available at + http://www.eclipse.org/org/documents/edl-v10.php. + + Contributors: + Linda DeMichiel - Java Persistence 2.0, Version 2.0 (October 1, 2009) + Specification available from http://jcp.org/en/jsr/detail?id=317 + + </xsd:documentation> + </xsd:annotation> + + <xsd:annotation> + <xsd:documentation><![CDATA[ + + This is the XML Schema for the persistence object/relational + mapping file. + The file may be named "META-INF/orm.xml" in the persistence + archive or it may be named some other name which would be + used to locate the file as resource on the classpath. + + Object/relational mapping files must indicate the object/relational + mapping file schema by using the persistence namespace: + + http://java.sun.com/xml/ns/persistence + + and indicate the version of the schema by + using the version element as shown below: + + <entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm + http://java.sun.com/xml/ns/persistence/orm/orm_2_0.xsd" + version="2.0"> + ... + </entity-mappings> + + + ]]> + </xsd:documentation> + </xsd:annotation> + + <xsd:complexType name="emptyType"/> + + <xsd:simpleType name="versionType"> + <xsd:restriction base="xsd:token"> + <xsd:pattern value="[0-9]+(\.[0-9]+)*"/> + </xsd:restriction> + </xsd:simpleType> + + <!-- **************************************************** --> + + <xsd:element name="entity-mappings"> + <xsd:complexType> + <xsd:annotation> + <xsd:documentation> + + The entity-mappings element is the root element of a mapping + file. It contains the following four types of elements: + + 1. The persistence-unit-metadata element contains metadata + for the entire persistence unit. It is undefined if this element + occurs in multiple mapping files within the same persistence unit. + + 2. The package, schema, catalog and access elements apply to all of + the entity, mapped-superclass and embeddable elements defined in + the same file in which they occur. + + 3. The sequence-generator, table-generator, named-query, + named-native-query and sql-result-set-mapping elements are global + to the persistence unit. It is undefined to have more than one + sequence-generator or table-generator of the same name in the same + or different mapping files in a persistence unit. It is also + undefined to have more than one named-query, named-native-query, or + result-set-mapping of the same name in the same or different mapping + files in a persistence unit. + + 4. The entity, mapped-superclass and embeddable elements each define + the mapping information for a managed persistent class. The mapping + information contained in these elements may be complete or it may + be partial. + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" + minOccurs="0"/> + <xsd:element name="persistence-unit-metadata" + type="orm:persistence-unit-metadata" + minOccurs="0"/> + <xsd:element name="package" type="xsd:string" + minOccurs="0"/> + <xsd:element name="schema" type="xsd:string" + minOccurs="0"/> + <xsd:element name="catalog" type="xsd:string" + minOccurs="0"/> + <xsd:element name="access" type="orm:access-type" + minOccurs="0"/> + <xsd:element name="sequence-generator" type="orm:sequence-generator" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="table-generator" type="orm:table-generator" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="named-query" type="orm:named-query" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="named-native-query" type="orm:named-native-query" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="sql-result-set-mapping" + type="orm:sql-result-set-mapping" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="mapped-superclass" type="orm:mapped-superclass" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="entity" type="orm:entity" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="embeddable" type="orm:embeddable" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="version" type="orm:versionType" + fixed="2.0" use="required"/> + </xsd:complexType> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:complexType name="persistence-unit-metadata"> + <xsd:annotation> + <xsd:documentation> + + Metadata that applies to the persistence unit and not just to + the mapping file in which it is contained. + + If the xml-mapping-metadata-complete element is specified, + the complete set of mapping metadata for the persistence unit + is contained in the XML mapping files for the persistence unit. + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:element name="xml-mapping-metadata-complete" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="persistence-unit-defaults" + type="orm:persistence-unit-defaults" + minOccurs="0"/> + </xsd:sequence> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="persistence-unit-defaults"> + <xsd:annotation> + <xsd:documentation> + + These defaults are applied to the persistence unit as a whole + unless they are overridden by local annotation or XML + element settings. + + schema - Used as the schema for all tables, secondary tables, join + tables, collection tables, sequence generators, and table + generators that apply to the persistence unit + catalog - Used as the catalog for all tables, secondary tables, join + tables, collection tables, sequence generators, and table + generators that apply to the persistence unit + delimited-identifiers - Used to treat database identifiers as + delimited identifiers. + access - Used as the access type for all managed classes in + the persistence unit + cascade-persist - Adds cascade-persist to the set of cascade options + in all entity relationships of the persistence unit + entity-listeners - List of default entity listeners to be invoked + on each entity in the persistence unit. + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:element name="schema" type="xsd:string" + minOccurs="0"/> + <xsd:element name="catalog" type="xsd:string" + minOccurs="0"/> + <xsd:element name="delimited-identifiers" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="access" type="orm:access-type" + minOccurs="0"/> + <xsd:element name="cascade-persist" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="entity-listeners" type="orm:entity-listeners" + minOccurs="0"/> + </xsd:sequence> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="entity"> + <xsd:annotation> + <xsd:documentation> + + Defines the settings and mappings for an entity. Is allowed to be + sparsely populated and used in conjunction with the annotations. + Alternatively, the metadata-complete attribute can be used to + indicate that no annotations on the entity class (and its fields + or properties) are to be processed. If this is the case then + the defaulting rules for the entity and its subelements will + be recursively applied. + + @Target(TYPE) @Retention(RUNTIME) + public @interface Entity { + String name() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:element name="table" type="orm:table" + minOccurs="0"/> + <xsd:element name="secondary-table" type="orm:secondary-table" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="primary-key-join-column" + type="orm:primary-key-join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="id-class" type="orm:id-class" minOccurs="0"/> + <xsd:element name="inheritance" type="orm:inheritance" minOccurs="0"/> + <xsd:element name="discriminator-value" type="orm:discriminator-value" + minOccurs="0"/> + <xsd:element name="discriminator-column" + type="orm:discriminator-column" + minOccurs="0"/> + <xsd:element name="sequence-generator" type="orm:sequence-generator" + minOccurs="0"/> + <xsd:element name="table-generator" type="orm:table-generator" + minOccurs="0"/> + <xsd:element name="named-query" type="orm:named-query" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="named-native-query" type="orm:named-native-query" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="sql-result-set-mapping" + type="orm:sql-result-set-mapping" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="exclude-default-listeners" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="exclude-superclass-listeners" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="entity-listeners" type="orm:entity-listeners" + minOccurs="0"/> + <xsd:element name="pre-persist" type="orm:pre-persist" minOccurs="0"/> + <xsd:element name="post-persist" type="orm:post-persist" + minOccurs="0"/> + <xsd:element name="pre-remove" type="orm:pre-remove" minOccurs="0"/> + <xsd:element name="post-remove" type="orm:post-remove" minOccurs="0"/> + <xsd:element name="pre-update" type="orm:pre-update" minOccurs="0"/> + <xsd:element name="post-update" type="orm:post-update" minOccurs="0"/> + <xsd:element name="post-load" type="orm:post-load" minOccurs="0"/> + <xsd:element name="attribute-override" type="orm:attribute-override" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="association-override" + type="orm:association-override" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="attributes" type="orm:attributes" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="class" type="xsd:string" use="required"/> + <xsd:attribute name="access" type="orm:access-type"/> + <xsd:attribute name="cacheable" type="xsd:boolean"/> + <xsd:attribute name="metadata-complete" type="xsd:boolean"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:simpleType name="access-type"> + <xsd:annotation> + <xsd:documentation> + + This element determines how the persistence provider accesses the + state of an entity or embedded object. + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="PROPERTY"/> + <xsd:enumeration value="FIELD"/> + </xsd:restriction> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:complexType name="association-override"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME) + public @interface AssociationOverride { + String name(); + JoinColumn[] joinColumns() default{}; + JoinTable joinTable() default @JoinTable; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:choice> + <xsd:element name="join-column" type="orm:join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="join-table" type="orm:join-table" + minOccurs="0"/> + </xsd:choice> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="attribute-override"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME) + public @interface AttributeOverride { + String name(); + Column column(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:element name="column" type="orm:column"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="attributes"> + <xsd:annotation> + <xsd:documentation> + + This element contains the entity field or property mappings. + It may be sparsely populated to include only a subset of the + fields or properties. If metadata-complete for the entity is true + then the remainder of the attributes will be defaulted according + to the default rules. + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:choice> + <xsd:element name="id" type="orm:id" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="embedded-id" type="orm:embedded-id" + minOccurs="0"/> + </xsd:choice> + <xsd:element name="basic" type="orm:basic" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="version" type="orm:version" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="many-to-one" type="orm:many-to-one" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="one-to-many" type="orm:one-to-many" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="one-to-one" type="orm:one-to-one" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="many-to-many" type="orm:many-to-many" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="element-collection" type="orm:element-collection" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="embedded" type="orm:embedded" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="transient" type="orm:transient" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="basic"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Basic { + FetchType fetch() default EAGER; + boolean optional() default true; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="column" type="orm:column" minOccurs="0"/> + <xsd:choice> + <xsd:element name="lob" type="orm:lob" minOccurs="0"/> + <xsd:element name="temporal" type="orm:temporal" minOccurs="0"/> + <xsd:element name="enumerated" type="orm:enumerated" minOccurs="0"/> + </xsd:choice> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="fetch" type="orm:fetch-type"/> + <xsd:attribute name="optional" type="xsd:boolean"/> + <xsd:attribute name="access" type="orm:access-type"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="cascade-type"> + <xsd:annotation> + <xsd:documentation> + + public enum CascadeType { ALL, PERSIST, MERGE, REMOVE, REFRESH, DETACH}; + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="cascade-all" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="cascade-persist" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="cascade-merge" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="cascade-remove" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="cascade-refresh" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="cascade-detach" type="orm:emptyType" + minOccurs="0"/> + </xsd:sequence> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="collection-table"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface CollectionTable { + String name() default ""; + String catalog() default ""; + String schema() default ""; + JoinColumn[] joinColumns() default {}; + UniqueConstraint[] uniqueConstraints() default {}; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="join-column" type="orm:join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="unique-constraint" type="orm:unique-constraint" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="catalog" type="xsd:string"/> + <xsd:attribute name="schema" type="xsd:string"/> + </xsd:complexType> + + +<!-- **************************************************** --> + + <xsd:complexType name="column"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Column { + String name() default ""; + boolean unique() default false; + boolean nullable() default true; + boolean insertable() default true; + boolean updatable() default true; + String columnDefinition() default ""; + String table() default ""; + int length() default 255; + int precision() default 0; // decimal precision + int scale() default 0; // decimal scale + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="unique" type="xsd:boolean"/> + <xsd:attribute name="nullable" type="xsd:boolean"/> + <xsd:attribute name="insertable" type="xsd:boolean"/> + <xsd:attribute name="updatable" type="xsd:boolean"/> + <xsd:attribute name="column-definition" type="xsd:string"/> + <xsd:attribute name="table" type="xsd:string"/> + <xsd:attribute name="length" type="xsd:int"/> + <xsd:attribute name="precision" type="xsd:int"/> + <xsd:attribute name="scale" type="xsd:int"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="column-result"> + <xsd:annotation> + <xsd:documentation> + + @Target({}) @Retention(RUNTIME) + public @interface ColumnResult { + String name(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="discriminator-column"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface DiscriminatorColumn { + String name() default "DTYPE"; + DiscriminatorType discriminatorType() default STRING; + String columnDefinition() default ""; + int length() default 31; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="discriminator-type" type="orm:discriminator-type"/> + <xsd:attribute name="column-definition" type="xsd:string"/> + <xsd:attribute name="length" type="xsd:int"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:simpleType name="discriminator-type"> + <xsd:annotation> + <xsd:documentation> + + public enum DiscriminatorType { STRING, CHAR, INTEGER }; + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="STRING"/> + <xsd:enumeration value="CHAR"/> + <xsd:enumeration value="INTEGER"/> + </xsd:restriction> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:simpleType name="discriminator-value"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface DiscriminatorValue { + String value(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:string"/> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:complexType name="element-collection"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface ElementCollection { + Class targetClass() default void.class; + FetchType fetch() default LAZY; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:choice> + <xsd:element name="order-by" type="orm:order-by" + minOccurs="0"/> + <xsd:element name="order-column" type="orm:order-column" + minOccurs="0"/> + </xsd:choice> + <xsd:choice> + <xsd:element name="map-key" type="orm:map-key" + minOccurs="0"/> + <xsd:sequence> + <xsd:element name="map-key-class" type="orm:map-key-class" + minOccurs="0"/> + <xsd:choice> + <xsd:element name="map-key-temporal" + type="orm:temporal" + minOccurs="0"/> + <xsd:element name="map-key-enumerated" + type="orm:enumerated" + minOccurs="0"/> + <xsd:element name="map-key-attribute-override" + type="orm:attribute-override" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:choice> + <xsd:choice> + <xsd:element name="map-key-column" + type="orm:map-key-column" + minOccurs="0"/> + <xsd:element name="map-key-join-column" + type="orm:map-key-join-column" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:choice> + </xsd:sequence> + </xsd:choice> + <xsd:choice> + <xsd:sequence> + <xsd:element name="column" type="orm:column" minOccurs="0"/> + <xsd:choice> + <xsd:element name="temporal" + type="orm:temporal" + minOccurs="0"/> + <xsd:element name="enumerated" + type="orm:enumerated" + minOccurs="0"/> + <xsd:element name="lob" + type="orm:lob" + minOccurs="0"/> + </xsd:choice> + </xsd:sequence> + <xsd:sequence> + <xsd:element name="attribute-override" + type="orm:attribute-override" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="association-override" + type="orm:association-override" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:choice> + <xsd:element name="collection-table" type="orm:collection-table" + minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="target-class" type="xsd:string"/> + <xsd:attribute name="fetch" type="orm:fetch-type"/> + <xsd:attribute name="access" type="orm:access-type"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="embeddable"> + <xsd:annotation> + <xsd:documentation> + + Defines the settings and mappings for embeddable objects. Is + allowed to be sparsely populated and used in conjunction with + the annotations. Alternatively, the metadata-complete attribute + can be used to indicate that no annotations are to be processed + in the class. If this is the case then the defaulting rules will + be recursively applied. + + @Target({TYPE}) @Retention(RUNTIME) + public @interface Embeddable {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:element name="attributes" type="orm:embeddable-attributes" + minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="class" type="xsd:string" use="required"/> + <xsd:attribute name="access" type="orm:access-type"/> + <xsd:attribute name="metadata-complete" type="xsd:boolean"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="embeddable-attributes"> + <xsd:sequence> + <xsd:element name="basic" type="orm:basic" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="many-to-one" type="orm:many-to-one" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="one-to-many" type="orm:one-to-many" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="one-to-one" type="orm:one-to-one" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="many-to-many" type="orm:many-to-many" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="element-collection" type="orm:element-collection" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="embedded" type="orm:embedded" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="transient" type="orm:transient" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="embedded"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Embedded {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="attribute-override" type="orm:attribute-override" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="association-override" + type="orm:association-override" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="access" type="orm:access-type"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="embedded-id"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface EmbeddedId {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="attribute-override" type="orm:attribute-override" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="access" type="orm:access-type"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="entity-listener"> + <xsd:annotation> + <xsd:documentation> + + Defines an entity listener to be invoked at lifecycle events + for the entities that list this listener. + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:element name="pre-persist" type="orm:pre-persist" minOccurs="0"/> + <xsd:element name="post-persist" type="orm:post-persist" + minOccurs="0"/> + <xsd:element name="pre-remove" type="orm:pre-remove" minOccurs="0"/> + <xsd:element name="post-remove" type="orm:post-remove" minOccurs="0"/> + <xsd:element name="pre-update" type="orm:pre-update" minOccurs="0"/> + <xsd:element name="post-update" type="orm:post-update" minOccurs="0"/> + <xsd:element name="post-load" type="orm:post-load" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="class" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="entity-listeners"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface EntityListeners { + Class[] value(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="entity-listener" type="orm:entity-listener" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="entity-result"> + <xsd:annotation> + <xsd:documentation> + + @Target({}) @Retention(RUNTIME) + public @interface EntityResult { + Class entityClass(); + FieldResult[] fields() default {}; + String discriminatorColumn() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="field-result" type="orm:field-result" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="entity-class" type="xsd:string" use="required"/> + <xsd:attribute name="discriminator-column" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:simpleType name="enum-type"> + <xsd:annotation> + <xsd:documentation> + + public enum EnumType { + ORDINAL, + STRING + } + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="ORDINAL"/> + <xsd:enumeration value="STRING"/> + </xsd:restriction> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:simpleType name="enumerated"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Enumerated { + EnumType value() default ORDINAL; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="orm:enum-type"/> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:simpleType name="fetch-type"> + <xsd:annotation> + <xsd:documentation> + + public enum FetchType { LAZY, EAGER }; + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="LAZY"/> + <xsd:enumeration value="EAGER"/> + </xsd:restriction> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:complexType name="field-result"> + <xsd:annotation> + <xsd:documentation> + + @Target({}) @Retention(RUNTIME) + public @interface FieldResult { + String name(); + String column(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="column" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="generated-value"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface GeneratedValue { + GenerationType strategy() default AUTO; + String generator() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="strategy" type="orm:generation-type"/> + <xsd:attribute name="generator" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:simpleType name="generation-type"> + <xsd:annotation> + <xsd:documentation> + + public enum GenerationType { TABLE, SEQUENCE, IDENTITY, AUTO }; + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="TABLE"/> + <xsd:enumeration value="SEQUENCE"/> + <xsd:enumeration value="IDENTITY"/> + <xsd:enumeration value="AUTO"/> + </xsd:restriction> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:complexType name="id"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Id {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="column" type="orm:column" + minOccurs="0"/> + <xsd:element name="generated-value" type="orm:generated-value" + minOccurs="0"/> + <xsd:element name="temporal" type="orm:temporal" + minOccurs="0"/> + <xsd:element name="table-generator" type="orm:table-generator" + minOccurs="0"/> + <xsd:element name="sequence-generator" type="orm:sequence-generator" + minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="access" type="orm:access-type"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="id-class"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface IdClass { + Class value(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="class" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="inheritance"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface Inheritance { + InheritanceType strategy() default SINGLE_TABLE; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="strategy" type="orm:inheritance-type"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:simpleType name="inheritance-type"> + <xsd:annotation> + <xsd:documentation> + + public enum InheritanceType + { SINGLE_TABLE, JOINED, TABLE_PER_CLASS}; + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="SINGLE_TABLE"/> + <xsd:enumeration value="JOINED"/> + <xsd:enumeration value="TABLE_PER_CLASS"/> + </xsd:restriction> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:complexType name="join-column"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface JoinColumn { + String name() default ""; + String referencedColumnName() default ""; + boolean unique() default false; + boolean nullable() default true; + boolean insertable() default true; + boolean updatable() default true; + String columnDefinition() default ""; + String table() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="referenced-column-name" type="xsd:string"/> + <xsd:attribute name="unique" type="xsd:boolean"/> + <xsd:attribute name="nullable" type="xsd:boolean"/> + <xsd:attribute name="insertable" type="xsd:boolean"/> + <xsd:attribute name="updatable" type="xsd:boolean"/> + <xsd:attribute name="column-definition" type="xsd:string"/> + <xsd:attribute name="table" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="join-table"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface JoinTable { + String name() default ""; + String catalog() default ""; + String schema() default ""; + JoinColumn[] joinColumns() default {}; + JoinColumn[] inverseJoinColumns() default {}; + UniqueConstraint[] uniqueConstraints() default {}; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="join-column" type="orm:join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="inverse-join-column" type="orm:join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="unique-constraint" type="orm:unique-constraint" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="catalog" type="xsd:string"/> + <xsd:attribute name="schema" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="lob"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Lob {} + + </xsd:documentation> + </xsd:annotation> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:simpleType name="lock-mode-type"> + <xsd:annotation> + <xsd:documentation> + + public enum LockModeType { READ, WRITE, OPTIMISTIC, OPTIMISTIC_FORCE_INCREMENT, PESSIMISTIC_READ, PESSIMISTIC_WRITE, PESSIMISTIC_FORCE_INCREMENT, NONE}; + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="READ"/> + <xsd:enumeration value="WRITE"/> + <xsd:enumeration value="OPTIMISTIC"/> + <xsd:enumeration value="OPTIMISTIC_FORCE_INCREMENT"/> + <xsd:enumeration value="PESSIMISTIC_READ"/> + <xsd:enumeration value="PESSIMISTIC_WRITE"/> + <xsd:enumeration value="PESSIMISTIC_FORCE_INCREMENT"/> + <xsd:enumeration value="NONE"/> + + </xsd:restriction> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:complexType name="many-to-many"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface ManyToMany { + Class targetEntity() default void.class; + CascadeType[] cascade() default {}; + FetchType fetch() default LAZY; + String mappedBy() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:choice> + <xsd:element name="order-by" type="orm:order-by" + minOccurs="0"/> + <xsd:element name="order-column" type="orm:order-column" + minOccurs="0"/> + </xsd:choice> + <xsd:choice> + <xsd:element name="map-key" type="orm:map-key" + minOccurs="0"/> + <xsd:sequence> + <xsd:element name="map-key-class" type="orm:map-key-class" + minOccurs="0"/> + <xsd:choice> + <xsd:element name="map-key-temporal" + type="orm:temporal" + minOccurs="0"/> + <xsd:element name="map-key-enumerated" + type="orm:enumerated" + minOccurs="0"/> + <xsd:element name="map-key-attribute-override" + type="orm:attribute-override" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:choice> + <xsd:choice> + <xsd:element name="map-key-column" type="orm:map-key-column" + minOccurs="0"/> + <xsd:element name="map-key-join-column" + type="orm:map-key-join-column" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:choice> + </xsd:sequence> + </xsd:choice> + <xsd:element name="join-table" type="orm:join-table" + minOccurs="0"/> + <xsd:element name="cascade" type="orm:cascade-type" + minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="target-entity" type="xsd:string"/> + <xsd:attribute name="fetch" type="orm:fetch-type"/> + <xsd:attribute name="access" type="orm:access-type"/> + <xsd:attribute name="mapped-by" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="many-to-one"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface ManyToOne { + Class targetEntity() default void.class; + CascadeType[] cascade() default {}; + FetchType fetch() default EAGER; + boolean optional() default true; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:choice> + <xsd:element name="join-column" type="orm:join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="join-table" type="orm:join-table" + minOccurs="0"/> + </xsd:choice> + <xsd:element name="cascade" type="orm:cascade-type" + minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="target-entity" type="xsd:string"/> + <xsd:attribute name="fetch" type="orm:fetch-type"/> + <xsd:attribute name="optional" type="xsd:boolean"/> + <xsd:attribute name="access" type="orm:access-type"/> + <xsd:attribute name="maps-id" type="xsd:string"/> + <xsd:attribute name="id" type="xsd:boolean"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="map-key"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface MapKey { + String name() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="map-key-class"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface MapKeyClass { + Class value(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="class" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="map-key-column"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface MapKeyColumn { + String name() default ""; + boolean unique() default false; + boolean nullable() default false; + boolean insertable() default true; + boolean updatable() default true; + String columnDefinition() default ""; + String table() default ""; + int length() default 255; + int precision() default 0; // decimal precision + int scale() default 0; // decimal scale + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="unique" type="xsd:boolean"/> + <xsd:attribute name="nullable" type="xsd:boolean"/> + <xsd:attribute name="insertable" type="xsd:boolean"/> + <xsd:attribute name="updatable" type="xsd:boolean"/> + <xsd:attribute name="column-definition" type="xsd:string"/> + <xsd:attribute name="table" type="xsd:string"/> + <xsd:attribute name="length" type="xsd:int"/> + <xsd:attribute name="precision" type="xsd:int"/> + <xsd:attribute name="scale" type="xsd:int"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="map-key-join-column"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface MapKeyJoinColumn { + String name() default ""; + String referencedColumnName() default ""; + boolean unique() default false; + boolean nullable() default false; + boolean insertable() default true; + boolean updatable() default true; + String columnDefinition() default ""; + String table() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="referenced-column-name" type="xsd:string"/> + <xsd:attribute name="unique" type="xsd:boolean"/> + <xsd:attribute name="nullable" type="xsd:boolean"/> + <xsd:attribute name="insertable" type="xsd:boolean"/> + <xsd:attribute name="updatable" type="xsd:boolean"/> + <xsd:attribute name="column-definition" type="xsd:string"/> + <xsd:attribute name="table" type="xsd:string"/> + </xsd:complexType> + + +<!-- **************************************************** --> + + <xsd:complexType name="mapped-superclass"> + <xsd:annotation> + <xsd:documentation> + + Defines the settings and mappings for a mapped superclass. Is + allowed to be sparsely populated and used in conjunction with + the annotations. Alternatively, the metadata-complete attribute + can be used to indicate that no annotations are to be processed + If this is the case then the defaulting rules will be recursively + applied. + + @Target(TYPE) @Retention(RUNTIME) + public @interface MappedSuperclass{} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:element name="id-class" type="orm:id-class" minOccurs="0"/> + <xsd:element name="exclude-default-listeners" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="exclude-superclass-listeners" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="entity-listeners" type="orm:entity-listeners" + minOccurs="0"/> + <xsd:element name="pre-persist" type="orm:pre-persist" minOccurs="0"/> + <xsd:element name="post-persist" type="orm:post-persist" + minOccurs="0"/> + <xsd:element name="pre-remove" type="orm:pre-remove" minOccurs="0"/> + <xsd:element name="post-remove" type="orm:post-remove" minOccurs="0"/> + <xsd:element name="pre-update" type="orm:pre-update" minOccurs="0"/> + <xsd:element name="post-update" type="orm:post-update" minOccurs="0"/> + <xsd:element name="post-load" type="orm:post-load" minOccurs="0"/> + <xsd:element name="attributes" type="orm:attributes" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="class" type="xsd:string" use="required"/> + <xsd:attribute name="access" type="orm:access-type"/> + <xsd:attribute name="metadata-complete" type="xsd:boolean"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="named-native-query"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface NamedNativeQuery { + String name(); + String query(); + QueryHint[] hints() default {}; + Class resultClass() default void.class; + String resultSetMapping() default ""; //named SqlResultSetMapping + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:element name="query" type="xsd:string"/> + <xsd:element name="hint" type="orm:query-hint" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="result-class" type="xsd:string"/> + <xsd:attribute name="result-set-mapping" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="named-query"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface NamedQuery { + String name(); + String query(); + LockModeType lockMode() default NONE; + QueryHint[] hints() default {}; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:element name="query" type="xsd:string"/> + <xsd:element name="lock-mode" type="orm:lock-mode-type" minOccurs="0"/> + <xsd:element name="hint" type="orm:query-hint" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="one-to-many"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface OneToMany { + Class targetEntity() default void.class; + CascadeType[] cascade() default {}; + FetchType fetch() default LAZY; + String mappedBy() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:choice> + <xsd:element name="order-by" type="orm:order-by" + minOccurs="0"/> + <xsd:element name="order-column" type="orm:order-column" + minOccurs="0"/> + </xsd:choice> + <xsd:choice> + <xsd:element name="map-key" type="orm:map-key" + minOccurs="0"/> + <xsd:sequence> + <xsd:element name="map-key-class" type="orm:map-key-class" + minOccurs="0"/> + <xsd:choice> + <xsd:element name="map-key-temporal" + type="orm:temporal" + minOccurs="0"/> + <xsd:element name="map-key-enumerated" + type="orm:enumerated" + minOccurs="0"/> + <xsd:element name="map-key-attribute-override" + type="orm:attribute-override" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:choice> + <xsd:choice> + <xsd:element name="map-key-column" type="orm:map-key-column" + minOccurs="0"/> + <xsd:element name="map-key-join-column" + type="orm:map-key-join-column" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:choice> + </xsd:sequence> + </xsd:choice> + <xsd:choice> + <xsd:element name="join-table" type="orm:join-table" + minOccurs="0"/> + <xsd:element name="join-column" type="orm:join-column" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:choice> + <xsd:element name="cascade" type="orm:cascade-type" + minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="target-entity" type="xsd:string"/> + <xsd:attribute name="fetch" type="orm:fetch-type"/> + <xsd:attribute name="access" type="orm:access-type"/> + <xsd:attribute name="mapped-by" type="xsd:string"/> + <xsd:attribute name="orphan-removal" type="xsd:boolean"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="one-to-one"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface OneToOne { + Class targetEntity() default void.class; + CascadeType[] cascade() default {}; + FetchType fetch() default EAGER; + boolean optional() default true; + String mappedBy() default ""; + boolean orphanRemoval() default false; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:choice> + <xsd:element name="primary-key-join-column" + type="orm:primary-key-join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="join-column" type="orm:join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="join-table" type="orm:join-table" + minOccurs="0"/> + </xsd:choice> + <xsd:element name="cascade" type="orm:cascade-type" + minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="target-entity" type="xsd:string"/> + <xsd:attribute name="fetch" type="orm:fetch-type"/> + <xsd:attribute name="optional" type="xsd:boolean"/> + <xsd:attribute name="access" type="orm:access-type"/> + <xsd:attribute name="mapped-by" type="xsd:string"/> + <xsd:attribute name="orphan-removal" type="xsd:boolean"/> + <xsd:attribute name="maps-id" type="xsd:string"/> + <xsd:attribute name="id" type="xsd:boolean"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:simpleType name="order-by"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface OrderBy { + String value() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:string"/> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:complexType name="order-column"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface OrderColumn { + String name() default ""; + boolean nullable() default true; + boolean insertable() default true; + boolean updatable() default true; + String columnDefinition() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="nullable" type="xsd:boolean"/> + <xsd:attribute name="insertable" type="xsd:boolean"/> + <xsd:attribute name="updatable" type="xsd:boolean"/> + <xsd:attribute name="column-definition" type="xsd:string"/> + </xsd:complexType> + + +<!-- **************************************************** --> + + <xsd:complexType name="post-load"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PostLoad {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="method-name" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="post-persist"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PostPersist {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="method-name" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="post-remove"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PostRemove {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="method-name" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="post-update"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PostUpdate {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="method-name" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="pre-persist"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PrePersist {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="method-name" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="pre-remove"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PreRemove {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="method-name" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="pre-update"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PreUpdate {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="method-name" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="primary-key-join-column"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME) + public @interface PrimaryKeyJoinColumn { + String name() default ""; + String referencedColumnName() default ""; + String columnDefinition() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="referenced-column-name" type="xsd:string"/> + <xsd:attribute name="column-definition" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="query-hint"> + <xsd:annotation> + <xsd:documentation> + + @Target({}) @Retention(RUNTIME) + public @interface QueryHint { + String name(); + String value(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="value" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="secondary-table"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface SecondaryTable { + String name(); + String catalog() default ""; + String schema() default ""; + PrimaryKeyJoinColumn[] pkJoinColumns() default {}; + UniqueConstraint[] uniqueConstraints() default {}; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="primary-key-join-column" + type="orm:primary-key-join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="unique-constraint" type="orm:unique-constraint" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="catalog" type="xsd:string"/> + <xsd:attribute name="schema" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="sequence-generator"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME) + public @interface SequenceGenerator { + String name(); + String sequenceName() default ""; + String catalog() default ""; + String schema() default ""; + int initialValue() default 1; + int allocationSize() default 50; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="sequence-name" type="xsd:string"/> + <xsd:attribute name="catalog" type="xsd:string"/> + <xsd:attribute name="schema" type="xsd:string"/> + <xsd:attribute name="initial-value" type="xsd:int"/> + <xsd:attribute name="allocation-size" type="xsd:int"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="sql-result-set-mapping"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface SqlResultSetMapping { + String name(); + EntityResult[] entities() default {}; + ColumnResult[] columns() default {}; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:element name="entity-result" type="orm:entity-result" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="column-result" type="orm:column-result" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="table"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface Table { + String name() default ""; + String catalog() default ""; + String schema() default ""; + UniqueConstraint[] uniqueConstraints() default {}; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="unique-constraint" type="orm:unique-constraint" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="catalog" type="xsd:string"/> + <xsd:attribute name="schema" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="table-generator"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME) + public @interface TableGenerator { + String name(); + String table() default ""; + String catalog() default ""; + String schema() default ""; + String pkColumnName() default ""; + String valueColumnName() default ""; + String pkColumnValue() default ""; + int initialValue() default 0; + int allocationSize() default 50; + UniqueConstraint[] uniqueConstraints() default {}; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:element name="unique-constraint" type="orm:unique-constraint" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="table" type="xsd:string"/> + <xsd:attribute name="catalog" type="xsd:string"/> + <xsd:attribute name="schema" type="xsd:string"/> + <xsd:attribute name="pk-column-name" type="xsd:string"/> + <xsd:attribute name="value-column-name" type="xsd:string"/> + <xsd:attribute name="pk-column-value" type="xsd:string"/> + <xsd:attribute name="initial-value" type="xsd:int"/> + <xsd:attribute name="allocation-size" type="xsd:int"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:simpleType name="temporal"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Temporal { + TemporalType value(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="orm:temporal-type"/> + </xsd:simpleType> + + <!-- **************************************************** --> + + <xsd:simpleType name="temporal-type"> + <xsd:annotation> + <xsd:documentation> + + public enum TemporalType { + DATE, // java.sql.Date + TIME, // java.sql.Time + TIMESTAMP // java.sql.Timestamp + } + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="DATE"/> + <xsd:enumeration value="TIME"/> + <xsd:enumeration value="TIMESTAMP"/> + </xsd:restriction> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:complexType name="transient"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Transient {} + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="unique-constraint"> + <xsd:annotation> + <xsd:documentation> + + @Target({}) @Retention(RUNTIME) + public @interface UniqueConstraint { + String name() default ""; + String[] columnNames(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="column-name" type="xsd:string" + maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="version"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Version {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="column" type="orm:column" minOccurs="0"/> + <xsd:element name="temporal" type="orm:temporal" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="access" type="orm:access-type"/> + </xsd:complexType> + +</xsd:schema> diff --git a/j2ee.persistence/external/j2ee.persistence-external-resources/orm_2_1.xsd b/j2ee.persistence/external/j2ee.persistence-external-resources/orm_2_1.xsd new file mode 100644 index 000000000..6aa624891 --- /dev/null +++ b/j2ee.persistence/external/j2ee.persistence-external-resources/orm_2_1.xsd @@ -0,0 +1,2336 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Java Persistence API object/relational mapping file schema --> +<xsd:schema targetNamespace="http://xmlns.jcp.org/xml/ns/persistence/orm" + xmlns:orm="http://xmlns.jcp.org/xml/ns/persistence/orm" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + elementFormDefault="qualified" + attributeFormDefault="unqualified" + version="2.1"> + + <xsd:annotation> + <xsd:documentation> + @(#)orm_2_1.xsd 2.1 February 15 2013 + </xsd:documentation> + </xsd:annotation> + + <xsd:annotation> + <xsd:documentation> + + Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved. + + This program and the accompanying materials are made available under the + terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0 + which accompanies this distribution. + The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html + and the Eclipse Distribution License is available at + http://www.eclipse.org/org/documents/edl-v10.php. + + Contributors: + Linda DeMichiel - Java Persistence 2.1, Version 2.1 (February 15, 2013) + Specification available from http://jcp.org/en/jsr/detail?id=338 + + </xsd:documentation> + </xsd:annotation> + + <xsd:annotation> + <xsd:documentation><![CDATA[ + + This is the XML Schema for the persistence object/relational + mapping file. + The file may be named "META-INF/orm.xml" in the persistence + archive or it may be named some other name which would be + used to locate the file as resource on the classpath. + + Object/relational mapping files must indicate the object/relational + mapping file schema by using the persistence namespace: + + http://xmlns.jcp.org/xml/ns/persistence/orm + + and indicate the version of the schema by + using the version element as shown below: + + <entity-mappings xmlns="http://xmlns.jcp.org/xml/ns/persistence/orm" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence/orm + http://xmlns.jcp.org/xml/ns/persistence/orm_2_1.xsd" + version="2.1"> + ... + </entity-mappings> + + + ]]></xsd:documentation> + </xsd:annotation> + + <xsd:complexType name="emptyType"/> + + <xsd:simpleType name="versionType"> + <xsd:restriction base="xsd:token"> + <xsd:pattern value="[0-9]+(\.[0-9]+)*"/> + </xsd:restriction> + </xsd:simpleType> + + <!-- **************************************************** --> + + <xsd:element name="entity-mappings"> + <xsd:complexType> + <xsd:annotation> + <xsd:documentation> + + The entity-mappings element is the root element of a mapping + file. It contains the following four types of elements: + + 1. The persistence-unit-metadata element contains metadata + for the entire persistence unit. It is undefined if this element + occurs in multiple mapping files within the same persistence unit. + + 2. The package, schema, catalog and access elements apply to all of + the entity, mapped-superclass and embeddable elements defined in + the same file in which they occur. + + 3. The sequence-generator, table-generator, converter, named-query, + named-native-query, named-stored-procedure-query, and + sql-result-set-mapping elements are global to the persistence + unit. It is undefined to have more than one sequence-generator + or table-generator of the same name in the same or different + mapping files in a persistence unit. It is undefined to have + more than one named-query, named-native-query, sql-result-set-mapping, + or named-stored-procedure-query of the same name in the same + or different mapping files in a persistence unit. It is also + undefined to have more than one converter for the same target + type in the same or different mapping files in a persistence unit. + + 4. The entity, mapped-superclass and embeddable elements each define + the mapping information for a managed persistent class. The mapping + information contained in these elements may be complete or it may + be partial. + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" + minOccurs="0"/> + <xsd:element name="persistence-unit-metadata" + type="orm:persistence-unit-metadata" + minOccurs="0"/> + <xsd:element name="package" type="xsd:string" + minOccurs="0"/> + <xsd:element name="schema" type="xsd:string" + minOccurs="0"/> + <xsd:element name="catalog" type="xsd:string" + minOccurs="0"/> + <xsd:element name="access" type="orm:access-type" + minOccurs="0"/> + <xsd:element name="sequence-generator" type="orm:sequence-generator" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="table-generator" type="orm:table-generator" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="named-query" type="orm:named-query" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="named-native-query" type="orm:named-native-query" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="named-stored-procedure-query" + type="orm:named-stored-procedure-query" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="sql-result-set-mapping" + type="orm:sql-result-set-mapping" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="mapped-superclass" type="orm:mapped-superclass" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="entity" type="orm:entity" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="embeddable" type="orm:embeddable" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="converter" type="orm:converter" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="version" type="orm:versionType" + fixed="2.1" use="required"/> + </xsd:complexType> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:complexType name="persistence-unit-metadata"> + <xsd:annotation> + <xsd:documentation> + + Metadata that applies to the persistence unit and not just to + the mapping file in which it is contained. + + If the xml-mapping-metadata-complete element is specified, + the complete set of mapping metadata for the persistence unit + is contained in the XML mapping files for the persistence unit. + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:element name="xml-mapping-metadata-complete" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="persistence-unit-defaults" + type="orm:persistence-unit-defaults" + minOccurs="0"/> + </xsd:sequence> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="persistence-unit-defaults"> + <xsd:annotation> + <xsd:documentation> + + These defaults are applied to the persistence unit as a whole + unless they are overridden by local annotation or XML + element settings. + + schema - Used as the schema for all tables, secondary tables, join + tables, collection tables, sequence generators, and table + generators that apply to the persistence unit + catalog - Used as the catalog for all tables, secondary tables, join + tables, collection tables, sequence generators, and table + generators that apply to the persistence unit + delimited-identifiers - Used to treat database identifiers as + delimited identifiers. + access - Used as the access type for all managed classes in + the persistence unit + cascade-persist - Adds cascade-persist to the set of cascade options + in all entity relationships of the persistence unit + entity-listeners - List of default entity listeners to be invoked + on each entity in the persistence unit. + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:element name="schema" type="xsd:string" + minOccurs="0"/> + <xsd:element name="catalog" type="xsd:string" + minOccurs="0"/> + <xsd:element name="delimited-identifiers" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="access" type="orm:access-type" + minOccurs="0"/> + <xsd:element name="cascade-persist" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="entity-listeners" type="orm:entity-listeners" + minOccurs="0"/> + </xsd:sequence> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="entity"> + <xsd:annotation> + <xsd:documentation> + + Defines the settings and mappings for an entity. Is allowed to be + sparsely populated and used in conjunction with the annotations. + Alternatively, the metadata-complete attribute can be used to + indicate that no annotations on the entity class (and its fields + or properties) are to be processed. If this is the case then + the defaulting rules for the entity and its subelements will + be recursively applied. + + @Target(TYPE) @Retention(RUNTIME) + public @interface Entity { + String name() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:element name="table" type="orm:table" + minOccurs="0"/> + <xsd:element name="secondary-table" type="orm:secondary-table" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:sequence> + <xsd:element name="primary-key-join-column" + type="orm:primary-key-join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="primary-key-foreign-key" + type="orm:foreign-key" + minOccurs="0"/> + </xsd:sequence> + <xsd:element name="id-class" type="orm:id-class" minOccurs="0"/> + <xsd:element name="inheritance" type="orm:inheritance" minOccurs="0"/> + <xsd:element name="discriminator-value" type="orm:discriminator-value" + minOccurs="0"/> + <xsd:element name="discriminator-column" + type="orm:discriminator-column" + minOccurs="0"/> + <xsd:element name="sequence-generator" type="orm:sequence-generator" + minOccurs="0"/> + <xsd:element name="table-generator" type="orm:table-generator" + minOccurs="0"/> + <xsd:element name="named-query" type="orm:named-query" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="named-native-query" type="orm:named-native-query" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="named-stored-procedure-query" + type="orm:named-stored-procedure-query" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="sql-result-set-mapping" + type="orm:sql-result-set-mapping" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="exclude-default-listeners" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="exclude-superclass-listeners" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="entity-listeners" type="orm:entity-listeners" + minOccurs="0"/> + <xsd:element name="pre-persist" type="orm:pre-persist" minOccurs="0"/> + <xsd:element name="post-persist" type="orm:post-persist" + minOccurs="0"/> + <xsd:element name="pre-remove" type="orm:pre-remove" minOccurs="0"/> + <xsd:element name="post-remove" type="orm:post-remove" minOccurs="0"/> + <xsd:element name="pre-update" type="orm:pre-update" minOccurs="0"/> + <xsd:element name="post-update" type="orm:post-update" minOccurs="0"/> + <xsd:element name="post-load" type="orm:post-load" minOccurs="0"/> + <xsd:element name="attribute-override" type="orm:attribute-override" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="association-override" + type="orm:association-override" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="convert" type="orm:convert" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="named-entity-graph" type="orm:named-entity-graph" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="attributes" type="orm:attributes" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="class" type="xsd:string" use="required"/> + <xsd:attribute name="access" type="orm:access-type"/> + <xsd:attribute name="cacheable" type="xsd:boolean"/> + <xsd:attribute name="metadata-complete" type="xsd:boolean"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:simpleType name="access-type"> + <xsd:annotation> + <xsd:documentation> + + This element determines how the persistence provider accesses the + state of an entity or embedded object. + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="PROPERTY"/> + <xsd:enumeration value="FIELD"/> + </xsd:restriction> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:complexType name="association-override"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME) + public @interface AssociationOverride { + String name(); + JoinColumn[] joinColumns() default{}; + JoinTable joinTable() default @JoinTable; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:choice> + <xsd:sequence> + <xsd:element name="join-column" type="orm:join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="foreign-key" type="orm:foreign-key" + minOccurs="0"/> + </xsd:sequence> + <xsd:element name="join-table" type="orm:join-table" + minOccurs="0"/> + </xsd:choice> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="attribute-override"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME) + public @interface AttributeOverride { + String name(); + Column column(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:element name="column" type="orm:column"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="attributes"> + <xsd:annotation> + <xsd:documentation> + + This element contains the entity field or property mappings. + It may be sparsely populated to include only a subset of the + fields or properties. If metadata-complete for the entity is true + then the remainder of the attributes will be defaulted according + to the default rules. + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:choice> + <xsd:element name="id" type="orm:id" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="embedded-id" type="orm:embedded-id" + minOccurs="0"/> + </xsd:choice> + <xsd:element name="basic" type="orm:basic" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="version" type="orm:version" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="many-to-one" type="orm:many-to-one" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="one-to-many" type="orm:one-to-many" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="one-to-one" type="orm:one-to-one" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="many-to-many" type="orm:many-to-many" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="element-collection" type="orm:element-collection" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="embedded" type="orm:embedded" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="transient" type="orm:transient" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="basic"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Basic { + FetchType fetch() default EAGER; + boolean optional() default true; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="column" type="orm:column" minOccurs="0"/> + <xsd:choice> + <xsd:element name="lob" type="orm:lob" minOccurs="0"/> + <xsd:element name="temporal" type="orm:temporal" minOccurs="0"/> + <xsd:element name="enumerated" type="orm:enumerated" minOccurs="0"/> + <xsd:element name="convert" type="orm:convert" minOccurs="0"/> + </xsd:choice> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="fetch" type="orm:fetch-type"/> + <xsd:attribute name="optional" type="xsd:boolean"/> + <xsd:attribute name="access" type="orm:access-type"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="cascade-type"> + <xsd:annotation> + <xsd:documentation> + + public enum CascadeType { ALL, PERSIST, MERGE, REMOVE, REFRESH, DETACH}; + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="cascade-all" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="cascade-persist" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="cascade-merge" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="cascade-remove" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="cascade-refresh" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="cascade-detach" type="orm:emptyType" + minOccurs="0"/> + </xsd:sequence> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="collection-table"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface CollectionTable { + String name() default ""; + String catalog() default ""; + String schema() default ""; + JoinColumn[] joinColumns() default {}; + UniqueConstraint[] uniqueConstraints() default {}; + Index[] indexes() default {}; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:sequence> + <xsd:element name="join-column" type="orm:join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="foreign-key" type="orm:foreign-key" + minOccurs="0"/> + </xsd:sequence> + <xsd:element name="unique-constraint" type="orm:unique-constraint" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="index" type="orm:index" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="catalog" type="xsd:string"/> + <xsd:attribute name="schema" type="xsd:string"/> + </xsd:complexType> + + +<!-- **************************************************** --> + + <xsd:complexType name="column"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Column { + String name() default ""; + boolean unique() default false; + boolean nullable() default true; + boolean insertable() default true; + boolean updatable() default true; + String columnDefinition() default ""; + String table() default ""; + int length() default 255; + int precision() default 0; // decimal precision + int scale() default 0; // decimal scale + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="unique" type="xsd:boolean"/> + <xsd:attribute name="nullable" type="xsd:boolean"/> + <xsd:attribute name="insertable" type="xsd:boolean"/> + <xsd:attribute name="updatable" type="xsd:boolean"/> + <xsd:attribute name="column-definition" type="xsd:string"/> + <xsd:attribute name="table" type="xsd:string"/> + <xsd:attribute name="length" type="xsd:int"/> + <xsd:attribute name="precision" type="xsd:int"/> + <xsd:attribute name="scale" type="xsd:int"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="column-result"> + <xsd:annotation> + <xsd:documentation> + + @Target({}) @Retention(RUNTIME) + public @interface ColumnResult { + String name(); + Class type() default void.class; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="class" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:simpleType name="constraint-mode"> + <xsd:annotation> + <xsd:documentation> + + public enum ConstraintMode {CONSTRAINT, NO_CONSTRAINT, PROVIDER_DEFAULT}; + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="CONSTRAINT"/> + <xsd:enumeration value="NO_CONSTRAINT"/> + <xsd:enumeration value="PROVIDER_DEFAULT"/> + </xsd:restriction> + </xsd:simpleType> + +<!-- **************************************************** --> + + + <xsd:complexType name="constructor-result"> + <xsd:annotation> + <xsd:documentation> + + @Target({}) @Retention(RUNTIME) + public @interface ConstructorResult { + Class targetClass(); + ColumnResult[] columns(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="column" type="orm:column-result" + maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="target-class" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="convert"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME) + public @interface Convert { + Class converter() default void.class; + String attributeName() default ""; + boolean disableConversion() default false; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="converter" type="xsd:string"/> + <xsd:attribute name="attribute-name" type="xsd:string"/> + <xsd:attribute name="disable-conversion" type="xsd:boolean"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="converter"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME) + public @interface Converter { + boolean autoApply() default false; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="class" type="xsd:string" use="required"/> + <xsd:attribute name="auto-apply" type="xsd:boolean"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="discriminator-column"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface DiscriminatorColumn { + String name() default "DTYPE"; + DiscriminatorType discriminatorType() default STRING; + String columnDefinition() default ""; + int length() default 31; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="discriminator-type" type="orm:discriminator-type"/> + <xsd:attribute name="column-definition" type="xsd:string"/> + <xsd:attribute name="length" type="xsd:int"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:simpleType name="discriminator-type"> + <xsd:annotation> + <xsd:documentation> + + public enum DiscriminatorType { STRING, CHAR, INTEGER }; + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="STRING"/> + <xsd:enumeration value="CHAR"/> + <xsd:enumeration value="INTEGER"/> + </xsd:restriction> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:simpleType name="discriminator-value"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface DiscriminatorValue { + String value(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:string"/> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:complexType name="element-collection"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface ElementCollection { + Class targetClass() default void.class; + FetchType fetch() default LAZY; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:choice> + <xsd:element name="order-by" type="orm:order-by" + minOccurs="0"/> + <xsd:element name="order-column" type="orm:order-column" + minOccurs="0"/> + </xsd:choice> + <xsd:choice> + <xsd:element name="map-key" type="orm:map-key" + minOccurs="0"/> + <xsd:sequence> + <xsd:element name="map-key-class" type="orm:map-key-class" + minOccurs="0"/> + <xsd:choice> + <xsd:element name="map-key-temporal" + type="orm:temporal" + minOccurs="0"/> + <xsd:element name="map-key-enumerated" + type="orm:enumerated" + minOccurs="0"/> + <xsd:sequence> + <xsd:element name="map-key-attribute-override" + type="orm:attribute-override" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="map-key-convert" type="orm:convert" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:choice> + <xsd:choice> + <xsd:element name="map-key-column" + type="orm:map-key-column" + minOccurs="0"/> + <xsd:sequence> + <xsd:element name="map-key-join-column" + type="orm:map-key-join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="map-key-foreign-key" + type="orm:foreign-key" + minOccurs="0"/> + </xsd:sequence> + </xsd:choice> + </xsd:sequence> + </xsd:choice> + <xsd:choice> + <xsd:sequence> + <xsd:element name="column" type="orm:column" minOccurs="0"/> + <xsd:choice> + <xsd:element name="temporal" + type="orm:temporal" + minOccurs="0"/> + <xsd:element name="enumerated" + type="orm:enumerated" + minOccurs="0"/> + <xsd:element name="lob" + type="orm:lob" + minOccurs="0"/> + </xsd:choice> + </xsd:sequence> + <xsd:sequence> + <xsd:element name="attribute-override" + type="orm:attribute-override" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="association-override" + type="orm:association-override" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="convert" type="orm:convert" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:choice> + <xsd:element name="collection-table" type="orm:collection-table" + minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="target-class" type="xsd:string"/> + <xsd:attribute name="fetch" type="orm:fetch-type"/> + <xsd:attribute name="access" type="orm:access-type"/> +</xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="embeddable"> + <xsd:annotation> + <xsd:documentation> + + Defines the settings and mappings for embeddable objects. Is + allowed to be sparsely populated and used in conjunction with + the annotations. Alternatively, the metadata-complete attribute + can be used to indicate that no annotations are to be processed + in the class. If this is the case then the defaulting rules will + be recursively applied. + + @Target({TYPE}) @Retention(RUNTIME) + public @interface Embeddable {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:element name="attributes" type="orm:embeddable-attributes" + minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="class" type="xsd:string" use="required"/> + <xsd:attribute name="access" type="orm:access-type"/> + <xsd:attribute name="metadata-complete" type="xsd:boolean"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="embeddable-attributes"> + <xsd:sequence> + <xsd:element name="basic" type="orm:basic" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="many-to-one" type="orm:many-to-one" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="one-to-many" type="orm:one-to-many" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="one-to-one" type="orm:one-to-one" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="many-to-many" type="orm:many-to-many" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="element-collection" type="orm:element-collection" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="embedded" type="orm:embedded" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="transient" type="orm:transient" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="embedded"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Embedded {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="attribute-override" type="orm:attribute-override" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="association-override" + type="orm:association-override" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="convert" type="orm:convert" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="access" type="orm:access-type"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="embedded-id"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface EmbeddedId {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="attribute-override" type="orm:attribute-override" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="access" type="orm:access-type"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="entity-listener"> + <xsd:annotation> + <xsd:documentation> + + Defines an entity listener to be invoked at lifecycle events + for the entities that list this listener. + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:element name="pre-persist" type="orm:pre-persist" minOccurs="0"/> + <xsd:element name="post-persist" type="orm:post-persist" + minOccurs="0"/> + <xsd:element name="pre-remove" type="orm:pre-remove" minOccurs="0"/> + <xsd:element name="post-remove" type="orm:post-remove" minOccurs="0"/> + <xsd:element name="pre-update" type="orm:pre-update" minOccurs="0"/> + <xsd:element name="post-update" type="orm:post-update" minOccurs="0"/> + <xsd:element name="post-load" type="orm:post-load" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="class" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="entity-listeners"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface EntityListeners { + Class[] value(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="entity-listener" type="orm:entity-listener" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="entity-result"> + <xsd:annotation> + <xsd:documentation> + + @Target({}) @Retention(RUNTIME) + public @interface EntityResult { + Class entityClass(); + FieldResult[] fields() default {}; + String discriminatorColumn() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="field-result" type="orm:field-result" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="entity-class" type="xsd:string" use="required"/> + <xsd:attribute name="discriminator-column" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:simpleType name="enum-type"> + <xsd:annotation> + <xsd:documentation> + + public enum EnumType { + ORDINAL, + STRING + } + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="ORDINAL"/> + <xsd:enumeration value="STRING"/> + </xsd:restriction> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:simpleType name="enumerated"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Enumerated { + EnumType value() default ORDINAL; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="orm:enum-type"/> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:simpleType name="fetch-type"> + <xsd:annotation> + <xsd:documentation> + + public enum FetchType { LAZY, EAGER }; + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="LAZY"/> + <xsd:enumeration value="EAGER"/> + </xsd:restriction> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:complexType name="field-result"> + <xsd:annotation> + <xsd:documentation> + + @Target({}) @Retention(RUNTIME) + public @interface FieldResult { + String name(); + String column(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="column" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="foreign-key"> + <xsd:annotation> + <xsd:documentation> + + @Target({}) @Retention(RUNTIME) + public @interface ForeignKey { + String name() default ""; + ConstraintMode value() default CONSTRAINT; + String foreign-key-definition() default ""; + + Note that the elements that embed the use of the annotation + default this use as @ForeignKey(PROVIDER_DEFAULT). + + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="constraint-mode" type="orm:constraint-mode"/> + <xsd:attribute name="foreign-key-definition" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="generated-value"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface GeneratedValue { + GenerationType strategy() default AUTO; + String generator() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="strategy" type="orm:generation-type"/> + <xsd:attribute name="generator" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:simpleType name="generation-type"> + <xsd:annotation> + <xsd:documentation> + + public enum GenerationType { TABLE, SEQUENCE, IDENTITY, AUTO }; + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="TABLE"/> + <xsd:enumeration value="SEQUENCE"/> + <xsd:enumeration value="IDENTITY"/> + <xsd:enumeration value="AUTO"/> + </xsd:restriction> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:complexType name="id"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Id {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="column" type="orm:column" + minOccurs="0"/> + <xsd:element name="generated-value" type="orm:generated-value" + minOccurs="0"/> + <xsd:element name="temporal" type="orm:temporal" + minOccurs="0"/> + <xsd:element name="table-generator" type="orm:table-generator" + minOccurs="0"/> + <xsd:element name="sequence-generator" type="orm:sequence-generator" + minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="access" type="orm:access-type"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="id-class"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface IdClass { + Class value(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="class" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="index"> + <xsd:annotation> + <xsd:documentation> + + @Target({}) @Retention(RUNTIME) + public @interface Index { + String name() default ""; + String columnList(); + boolean unique() default false; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="column-list" type="xsd:string" use="required"/> + <xsd:attribute name="unique" type="xsd:boolean"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="inheritance"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface Inheritance { + InheritanceType strategy() default SINGLE_TABLE; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="strategy" type="orm:inheritance-type"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:simpleType name="inheritance-type"> + <xsd:annotation> + <xsd:documentation> + + public enum InheritanceType + { SINGLE_TABLE, JOINED, TABLE_PER_CLASS}; + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="SINGLE_TABLE"/> + <xsd:enumeration value="JOINED"/> + <xsd:enumeration value="TABLE_PER_CLASS"/> + </xsd:restriction> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:complexType name="join-column"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface JoinColumn { + String name() default ""; + String referencedColumnName() default ""; + boolean unique() default false; + boolean nullable() default true; + boolean insertable() default true; + boolean updatable() default true; + String columnDefinition() default ""; + String table() default ""; + ForeignKey foreignKey() default @ForeignKey(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="referenced-column-name" type="xsd:string"/> + <xsd:attribute name="unique" type="xsd:boolean"/> + <xsd:attribute name="nullable" type="xsd:boolean"/> + <xsd:attribute name="insertable" type="xsd:boolean"/> + <xsd:attribute name="updatable" type="xsd:boolean"/> + <xsd:attribute name="column-definition" type="xsd:string"/> + <xsd:attribute name="table" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="join-table"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface JoinTable { + String name() default ""; + String catalog() default ""; + String schema() default ""; + JoinColumn[] joinColumns() default {}; + JoinColumn[] inverseJoinColumns() default {}; + UniqueConstraint[] uniqueConstraints() default {}; + Index[] indexes() default {}; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:sequence> + <xsd:element name="join-column" type="orm:join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="foreign-key" type="orm:foreign-key" + minOccurs="0"/> + </xsd:sequence> + <xsd:sequence> + <xsd:element name="inverse-join-column" type="orm:join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="inverse-foreign-key" type="orm:foreign-key" + minOccurs="0"/> + </xsd:sequence> + <xsd:element name="unique-constraint" type="orm:unique-constraint" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="index" type="orm:index" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="catalog" type="xsd:string"/> + <xsd:attribute name="schema" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="lob"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Lob {} + + </xsd:documentation> + </xsd:annotation> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:simpleType name="lock-mode-type"> + <xsd:annotation> + <xsd:documentation> + + public enum LockModeType { READ, WRITE, OPTIMISTIC, OPTIMISTIC_FORCE_INCREMENT, PESSIMISTIC_READ, PESSIMISTIC_WRITE, PESSIMISTIC_FORCE_INCREMENT, NONE}; + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="READ"/> + <xsd:enumeration value="WRITE"/> + <xsd:enumeration value="OPTIMISTIC"/> + <xsd:enumeration value="OPTIMISTIC_FORCE_INCREMENT"/> + <xsd:enumeration value="PESSIMISTIC_READ"/> + <xsd:enumeration value="PESSIMISTIC_WRITE"/> + <xsd:enumeration value="PESSIMISTIC_FORCE_INCREMENT"/> + <xsd:enumeration value="NONE"/> + + </xsd:restriction> + </xsd:simpleType> + +<!-- **************************************************** --> + +<xsd:complexType name="many-to-many"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface ManyToMany { + Class targetEntity() default void.class; + CascadeType[] cascade() default {}; + FetchType fetch() default LAZY; + String mappedBy() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:choice> + <xsd:element name="order-by" type="orm:order-by" + minOccurs="0"/> + <xsd:element name="order-column" type="orm:order-column" + minOccurs="0"/> + </xsd:choice> + <xsd:choice> + <xsd:element name="map-key" type="orm:map-key" + minOccurs="0"/> + <xsd:sequence> + <xsd:element name="map-key-class" type="orm:map-key-class" + minOccurs="0"/> + <xsd:choice> + <xsd:element name="map-key-temporal" + type="orm:temporal" + minOccurs="0"/> + <xsd:element name="map-key-enumerated" + type="orm:enumerated" + minOccurs="0"/> + <xsd:sequence> + <xsd:element name="map-key-attribute-override" + type="orm:attribute-override" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="map-key-convert" type="orm:convert" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:choice> + <xsd:choice> + <xsd:element name="map-key-column" type="orm:map-key-column" + minOccurs="0"/> + <xsd:sequence> + <xsd:element name="map-key-join-column" + type="orm:map-key-join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="map-key-foreign-key" + type="orm:foreign-key" + minOccurs="0"/> + </xsd:sequence> + </xsd:choice> + </xsd:sequence> + </xsd:choice> + <xsd:element name="join-table" type="orm:join-table" + minOccurs="0"/> + <xsd:element name="cascade" type="orm:cascade-type" + minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="target-entity" type="xsd:string"/> + <xsd:attribute name="fetch" type="orm:fetch-type"/> + <xsd:attribute name="access" type="orm:access-type"/> + <xsd:attribute name="mapped-by" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="many-to-one"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface ManyToOne { + Class targetEntity() default void.class; + CascadeType[] cascade() default {}; + FetchType fetch() default EAGER; + boolean optional() default true; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:choice> + <xsd:sequence> + <xsd:element name="join-column" type="orm:join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="foreign-key" type="orm:foreign-key" + minOccurs="0"/> + </xsd:sequence> + <xsd:element name="join-table" type="orm:join-table" + minOccurs="0"/> + </xsd:choice> + <xsd:element name="cascade" type="orm:cascade-type" + minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="target-entity" type="xsd:string"/> + <xsd:attribute name="fetch" type="orm:fetch-type"/> + <xsd:attribute name="optional" type="xsd:boolean"/> + <xsd:attribute name="access" type="orm:access-type"/> + <xsd:attribute name="maps-id" type="xsd:string"/> + <xsd:attribute name="id" type="xsd:boolean"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="map-key"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface MapKey { + String name() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="map-key-class"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface MapKeyClass { + Class value(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="class" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="map-key-column"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface MapKeyColumn { + String name() default ""; + boolean unique() default false; + boolean nullable() default false; + boolean insertable() default true; + boolean updatable() default true; + String columnDefinition() default ""; + String table() default ""; + int length() default 255; + int precision() default 0; // decimal precision + int scale() default 0; // decimal scale + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="unique" type="xsd:boolean"/> + <xsd:attribute name="nullable" type="xsd:boolean"/> + <xsd:attribute name="insertable" type="xsd:boolean"/> + <xsd:attribute name="updatable" type="xsd:boolean"/> + <xsd:attribute name="column-definition" type="xsd:string"/> + <xsd:attribute name="table" type="xsd:string"/> + <xsd:attribute name="length" type="xsd:int"/> + <xsd:attribute name="precision" type="xsd:int"/> + <xsd:attribute name="scale" type="xsd:int"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="map-key-join-column"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface MapKeyJoinColumn { + String name() default ""; + String referencedColumnName() default ""; + boolean unique() default false; + boolean nullable() default false; + boolean insertable() default true; + boolean updatable() default true; + String columnDefinition() default ""; + String table() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="referenced-column-name" type="xsd:string"/> + <xsd:attribute name="unique" type="xsd:boolean"/> + <xsd:attribute name="nullable" type="xsd:boolean"/> + <xsd:attribute name="insertable" type="xsd:boolean"/> + <xsd:attribute name="updatable" type="xsd:boolean"/> + <xsd:attribute name="column-definition" type="xsd:string"/> + <xsd:attribute name="table" type="xsd:string"/> + </xsd:complexType> + + +<!-- **************************************************** --> + + <xsd:complexType name="mapped-superclass"> + <xsd:annotation> + <xsd:documentation> + + Defines the settings and mappings for a mapped superclass. Is + allowed to be sparsely populated and used in conjunction with + the annotations. Alternatively, the metadata-complete attribute + can be used to indicate that no annotations are to be processed + If this is the case then the defaulting rules will be recursively + applied. + + @Target(TYPE) @Retention(RUNTIME) + public @interface MappedSuperclass{} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:element name="id-class" type="orm:id-class" minOccurs="0"/> + <xsd:element name="exclude-default-listeners" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="exclude-superclass-listeners" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="entity-listeners" type="orm:entity-listeners" + minOccurs="0"/> + <xsd:element name="pre-persist" type="orm:pre-persist" minOccurs="0"/> + <xsd:element name="post-persist" type="orm:post-persist" + minOccurs="0"/> + <xsd:element name="pre-remove" type="orm:pre-remove" minOccurs="0"/> + <xsd:element name="post-remove" type="orm:post-remove" minOccurs="0"/> + <xsd:element name="pre-update" type="orm:pre-update" minOccurs="0"/> + <xsd:element name="post-update" type="orm:post-update" minOccurs="0"/> + <xsd:element name="post-load" type="orm:post-load" minOccurs="0"/> + <xsd:element name="attributes" type="orm:attributes" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="class" type="xsd:string" use="required"/> + <xsd:attribute name="access" type="orm:access-type"/> + <xsd:attribute name="metadata-complete" type="xsd:boolean"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="named-attribute-node"> + <xsd:annotation> + <xsd:documentation> + + @Target({}) @Retention(RUNTIME) + public @interface NamedAttributeNode { + String value(); + String subgraph() default ""; + String keySubgraph() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="subgraph" type="xsd:string"/> + <xsd:attribute name="key-subgraph" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="named-entity-graph"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface NamedEntityGraph { + String name() default ""; + NamedAttributeNode[] attributeNodes() default {}; + boolean includeAllAttributes() default false; + NamedSubgraph[] subgraphs() default {}; + NamedSubGraph[] subclassSubgraphs() default {}; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="named-attribute-node" + type="orm:named-attribute-node" + minOccurs="0" + maxOccurs="unbounded"/> + <xsd:element name="subgraph" + type="orm:named-subgraph" + minOccurs="0" + maxOccurs="unbounded"/> + <xsd:element name="subclass-subgraph" + type="orm:named-subgraph" + minOccurs="0" + maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="include-all-attributes" type="xsd:boolean"/> + </xsd:complexType> + + +<!-- **************************************************** --> + + <xsd:complexType name="named-native-query"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface NamedNativeQuery { + String name(); + String query(); + QueryHint[] hints() default {}; + Class resultClass() default void.class; + String resultSetMapping() default ""; //named SqlResultSetMapping + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:element name="query" type="xsd:string"/> + <xsd:element name="hint" type="orm:query-hint" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="result-class" type="xsd:string"/> + <xsd:attribute name="result-set-mapping" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="named-query"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface NamedQuery { + String name(); + String query(); + LockModeType lockMode() default NONE; + QueryHint[] hints() default {}; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:element name="query" type="xsd:string"/> + <xsd:element name="lock-mode" type="orm:lock-mode-type" minOccurs="0"/> + <xsd:element name="hint" type="orm:query-hint" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> +</xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="named-stored-procedure-query"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface NamedStoredProcedureQuery { + String name(); + String procedureName(); + StoredProcedureParameter[] parameters() default {}; + Class[] resultClasses() default {}; + String[] resultSetMappings() default{}; + QueryHint[] hints() default {}; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:element name="parameter" + type="orm:stored-procedure-parameter" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="result-class" type="xsd:string" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="result-set-mapping" type="xsd:string" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="hint" type="orm:query-hint" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="procedure-name" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="named-subgraph"> + <xsd:annotation> + <xsd:documentation> + + @Target({}) @Retention(RUNTIME) + public @interface NamedSubgraph { + String name(); + Class type() default void.class; + NamedAttributeNode[] attributeNodes(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="named-attribute-node" + type="orm:named-attribute-node" + minOccurs="0" + maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="class" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + +<xsd:complexType name="one-to-many"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface OneToMany { + Class targetEntity() default void.class; + CascadeType[] cascade() default {}; + FetchType fetch() default LAZY; + String mappedBy() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:choice> + <xsd:element name="order-by" type="orm:order-by" + minOccurs="0"/> + <xsd:element name="order-column" type="orm:order-column" + minOccurs="0"/> + </xsd:choice> + <xsd:choice> + <xsd:element name="map-key" type="orm:map-key" + minOccurs="0"/> + <xsd:sequence> + <xsd:element name="map-key-class" type="orm:map-key-class" + minOccurs="0"/> + <xsd:choice> + <xsd:element name="map-key-temporal" + type="orm:temporal" + minOccurs="0"/> + <xsd:element name="map-key-enumerated" + type="orm:enumerated" + minOccurs="0"/> + <xsd:sequence> + <xsd:element name="map-key-attribute-override" + type="orm:attribute-override" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="map-key-convert" type="orm:convert" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:choice> + <xsd:choice> + <xsd:element name="map-key-column" type="orm:map-key-column" + minOccurs="0"/> + <xsd:sequence> + <xsd:element name="map-key-join-column" + type="orm:map-key-join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="map-key-foreign-key" + type="orm:foreign-key" + minOccurs="0"/> + </xsd:sequence> + </xsd:choice> + </xsd:sequence> + </xsd:choice> + <xsd:choice> + <xsd:element name="join-table" type="orm:join-table" + minOccurs="0"/> + <xsd:sequence> + <xsd:element name="join-column" type="orm:join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="foreign-key" type="orm:foreign-key" + minOccurs="0"/> + </xsd:sequence> + </xsd:choice> + <xsd:element name="cascade" type="orm:cascade-type" + minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="target-entity" type="xsd:string"/> + <xsd:attribute name="fetch" type="orm:fetch-type"/> + <xsd:attribute name="access" type="orm:access-type"/> + <xsd:attribute name="mapped-by" type="xsd:string"/> + <xsd:attribute name="orphan-removal" type="xsd:boolean"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="one-to-one"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface OneToOne { + Class targetEntity() default void.class; + CascadeType[] cascade() default {}; + FetchType fetch() default EAGER; + boolean optional() default true; + String mappedBy() default ""; + boolean orphanRemoval() default false; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:choice> + <xsd:sequence> + <xsd:element name="primary-key-join-column" + type="orm:primary-key-join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="primary-key-foreign-key" + type="orm:foreign-key" + minOccurs="0"/> + </xsd:sequence> + <xsd:sequence> + <xsd:element name="join-column" type="orm:join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="foreign-key" type="orm:foreign-key" + minOccurs="0"/> + </xsd:sequence> + <xsd:element name="join-table" type="orm:join-table" + minOccurs="0"/> + </xsd:choice> + <xsd:element name="cascade" type="orm:cascade-type" + minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="target-entity" type="xsd:string"/> + <xsd:attribute name="fetch" type="orm:fetch-type"/> + <xsd:attribute name="optional" type="xsd:boolean"/> + <xsd:attribute name="access" type="orm:access-type"/> + <xsd:attribute name="mapped-by" type="xsd:string"/> + <xsd:attribute name="orphan-removal" type="xsd:boolean"/> + <xsd:attribute name="maps-id" type="xsd:string"/> + <xsd:attribute name="id" type="xsd:boolean"/> +</xsd:complexType> + +<!-- **************************************************** --> + + <xsd:simpleType name="order-by"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface OrderBy { + String value() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:string"/> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:complexType name="order-column"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface OrderColumn { + String name() default ""; + boolean nullable() default true; + boolean insertable() default true; + boolean updatable() default true; + String columnDefinition() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="nullable" type="xsd:boolean"/> + <xsd:attribute name="insertable" type="xsd:boolean"/> + <xsd:attribute name="updatable" type="xsd:boolean"/> + <xsd:attribute name="column-definition" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:simpleType name="parameter-mode"> + <xsd:annotation> + <xsd:documentation> + + public enum ParameterMode { IN, INOUT, OUT, REF_CURSOR}; + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="IN"/> + <xsd:enumeration value="INOUT"/> + <xsd:enumeration value="OUT"/> + <xsd:enumeration value="REF_CURSOR"/> + </xsd:restriction> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:complexType name="post-load"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PostLoad {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="method-name" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="post-persist"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PostPersist {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="method-name" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="post-remove"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PostRemove {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="method-name" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="post-update"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PostUpdate {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="method-name" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="pre-persist"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PrePersist {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="method-name" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="pre-remove"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PreRemove {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="method-name" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="pre-update"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PreUpdate {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="method-name" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="primary-key-join-column"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME) + public @interface PrimaryKeyJoinColumn { + String name() default ""; + String referencedColumnName() default ""; + String columnDefinition() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="referenced-column-name" type="xsd:string"/> + <xsd:attribute name="column-definition" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="query-hint"> + <xsd:annotation> + <xsd:documentation> + + @Target({}) @Retention(RUNTIME) + public @interface QueryHint { + String name(); + String value(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="value" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="secondary-table"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface SecondaryTable { + String name(); + String catalog() default ""; + String schema() default ""; + PrimaryKeyJoinColumn[] pkJoinColumns() default {}; + UniqueConstraint[] uniqueConstraints() default {}; + Index[] indexes() default {}; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:sequence> + <xsd:element name="primary-key-join-column" + type="orm:primary-key-join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="primary-key-foreign-key" + type="orm:foreign-key" + minOccurs="0"/> + </xsd:sequence> + <xsd:element name="unique-constraint" type="orm:unique-constraint" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="index" type="orm:index" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="catalog" type="xsd:string"/> + <xsd:attribute name="schema" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="sequence-generator"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME) + public @interface SequenceGenerator { + String name(); + String sequenceName() default ""; + String catalog() default ""; + String schema() default ""; + int initialValue() default 1; + int allocationSize() default 50; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="sequence-name" type="xsd:string"/> + <xsd:attribute name="catalog" type="xsd:string"/> + <xsd:attribute name="schema" type="xsd:string"/> + <xsd:attribute name="initial-value" type="xsd:int"/> + <xsd:attribute name="allocation-size" type="xsd:int"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="sql-result-set-mapping"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface SqlResultSetMapping { + String name(); + EntityResult[] entities() default {}; + ConstructorResult[] classes() default{}; + ColumnResult[] columns() default {}; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:element name="entity-result" type="orm:entity-result" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="constructor-result" type="orm:constructor-result" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="column-result" type="orm:column-result" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="stored-procedure-parameter"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface StoredProcedureParameter { + String name() default ""; + ParameterMode mode() default ParameterMode.IN; + Class type(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" + minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="class" type="xsd:string" use="required"/> + <xsd:attribute name="mode" type="orm:parameter-mode"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="table"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface Table { + String name() default ""; + String catalog() default ""; + String schema() default ""; + UniqueConstraint[] uniqueConstraints() default {}; + Index[] indexes() default {}; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="unique-constraint" type="orm:unique-constraint" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="index" type="orm:index" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="catalog" type="xsd:string"/> + <xsd:attribute name="schema" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="table-generator"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME) + public @interface TableGenerator { + String name(); + String table() default ""; + String catalog() default ""; + String schema() default ""; + String pkColumnName() default ""; + String valueColumnName() default ""; + String pkColumnValue() default ""; + int initialValue() default 0; + int allocationSize() default 50; + UniqueConstraint[] uniqueConstraints() default {}; + Indexes[] indexes() default {}; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:element name="unique-constraint" type="orm:unique-constraint" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="index" type="orm:index" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="table" type="xsd:string"/> + <xsd:attribute name="catalog" type="xsd:string"/> + <xsd:attribute name="schema" type="xsd:string"/> + <xsd:attribute name="pk-column-name" type="xsd:string"/> + <xsd:attribute name="value-column-name" type="xsd:string"/> + <xsd:attribute name="pk-column-value" type="xsd:string"/> + <xsd:attribute name="initial-value" type="xsd:int"/> + <xsd:attribute name="allocation-size" type="xsd:int"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:simpleType name="temporal"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Temporal { + TemporalType value(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="orm:temporal-type"/> + </xsd:simpleType> + + <!-- **************************************************** --> + + <xsd:simpleType name="temporal-type"> + <xsd:annotation> + <xsd:documentation> + + public enum TemporalType { + DATE, // java.sql.Date + TIME, // java.sql.Time + TIMESTAMP // java.sql.Timestamp + } + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="DATE"/> + <xsd:enumeration value="TIME"/> + <xsd:enumeration value="TIMESTAMP"/> + </xsd:restriction> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:complexType name="transient"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Transient {} + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="unique-constraint"> + <xsd:annotation> + <xsd:documentation> + + @Target({}) @Retention(RUNTIME) + public @interface UniqueConstraint { + String name() default ""; + String[] columnNames(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="column-name" type="xsd:string" + maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="version"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Version {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="column" type="orm:column" minOccurs="0"/> + <xsd:element name="temporal" type="orm:temporal" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="access" type="orm:access-type"/> + </xsd:complexType> + +</xsd:schema> diff --git a/j2ee.persistence/external/j2ee.persistence-external-resources/persistence_1_0.xsd b/j2ee.persistence/external/j2ee.persistence-external-resources/persistence_1_0.xsd new file mode 100644 index 000000000..9f3c2568c --- /dev/null +++ b/j2ee.persistence/external/j2ee.persistence-external-resources/persistence_1_0.xsd @@ -0,0 +1,308 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- persistence.xml schema --> +<xsd:schema targetNamespace="http://java.sun.com/xml/ns/persistence" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:persistence="http://java.sun.com/xml/ns/persistence" + elementFormDefault="qualified" + attributeFormDefault="unqualified" + version="1.0"> + + <xsd:annotation> + <xsd:documentation> + @(#)persistence_1_0.xsd 1.0 Feb 9 2006 + </xsd:documentation> + </xsd:annotation> + + <xsd:annotation> + <xsd:documentation> + + DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + + Copyright 2005-2010 Oracle and/or its affiliates. All rights reserved. + +Oracle and Java are registered trademarks of Oracle and/or its affiliates. +Other names may be trademarks of their respective owners. + + The contents of this file are subject to the terms of either the + GNU General Public License Version 2 only ("GPL") or the Common + Development and Distribution License("CDDL") (collectively, the + "License"). You may not use this file except in compliance with + the License. You can obtain a copy of the License at + https://glassfish.dev.java.net/public/CDDL+GPL.html or + glassfish/bootstrap/legal/LICENSE.txt. See the License for the + specific language governing permissions and limitations under the + License. + + When distributing the software, include this License Header + Notice in each file and include the License file at + glassfish/bootstrap/legal/LICENSE.txt. Sun designates this + particular file as subject to the "Classpath" exception as + provided by Oracle in the GPL Version 2 section of the License file + that accompanied this code. If applicable, add the following + below the License Header, with the fields enclosed by brackets [] + replaced by your own identifying information: + "Portions Copyrighted [year] [name of copyright owner]" + + Contributor(s): + + If you wish your version of this file to be governed by only the + CDDL or only the GPL Version 2, indicate your decision by adding + "[Contributor] elects to include this software in this + distribution under the [CDDL or GPL Version 2] license." If you + don't indicate a single choice of license, a recipient has the + option to distribute your version of this file under either the + CDDL, the GPL Version 2 or to extend the choice of license to its + licensees as provided above. However, if you add GPL Version 2 + code and therefore, elected the GPL Version 2 license, then the + option applies only if the new code is made subject to such + option by the copyright holder. + + </xsd:documentation> + </xsd:annotation> + + <xsd:annotation> + <xsd:documentation><![CDATA[ + + This is the XML Schema for the persistence configuration file. + The file must be named "META-INF/persistence.xml" in the + persistence archive. + Persistence configuration files must indicate + the persistence schema by using the persistence namespace: + + http://java.sun.com/xml/ns/persistence + + and indicate the version of the schema by + using the version element as shown below: + + <persistence xmlns="http://java.sun.com/xml/ns/persistence" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence + http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" + version="1.0"> + ... + </persistence> + + ]]></xsd:documentation> + </xsd:annotation> + + <xsd:simpleType name="versionType"> + <xsd:restriction base="xsd:token"> + <xsd:pattern value="[0-9]+(\.[0-9]+)*"/> + </xsd:restriction> + </xsd:simpleType> + + <!-- **************************************************** --> + + <xsd:element name="persistence"> + <xsd:complexType> + <xsd:sequence> + + <!-- **************************************************** --> + + <xsd:element name="persistence-unit" + minOccurs="0" maxOccurs="unbounded"> + <xsd:complexType> + <xsd:annotation> + <xsd:documentation> + + Configuration of a persistence unit. + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + + <!-- **************************************************** --> + + <xsd:element name="description" type="xsd:string" + minOccurs="0"> + <xsd:annotation> + <xsd:documentation> + + Textual description of this persistence unit. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:element name="provider" type="xsd:string" + minOccurs="0"> + <xsd:annotation> + <xsd:documentation> + + Provider class that supplies EntityManagers for this + persistence unit. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:element name="jta-data-source" type="xsd:string" + minOccurs="0"> + <xsd:annotation> + <xsd:documentation> + + The container-specific name of the JTA datasource to use. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:element name="non-jta-data-source" type="xsd:string" + minOccurs="0"> + <xsd:annotation> + <xsd:documentation> + + The container-specific name of a non-JTA datasource to use. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:element name="mapping-file" type="xsd:string" + minOccurs="0" maxOccurs="unbounded"> + <xsd:annotation> + <xsd:documentation> + + File containing mapping information. Loaded as a resource + by the persistence provider. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:element name="jar-file" type="xsd:string" + minOccurs="0" maxOccurs="unbounded"> + <xsd:annotation> + <xsd:documentation> + + Jar file that should be scanned for entities. + Not applicable to Java SE persistence units. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:element name="class" type="xsd:string" + minOccurs="0" maxOccurs="unbounded"> + <xsd:annotation> + <xsd:documentation> + + Class to scan for annotations. It should be annotated + with either @Entity, @Embeddable or @MappedSuperclass. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:element name="exclude-unlisted-classes" type="xsd:boolean" + default="false" minOccurs="0"> + <xsd:annotation> + <xsd:documentation> + + When set to true then only listed classes and jars will + be scanned for persistent classes, otherwise the enclosing + jar or directory will also be scanned. Not applicable to + Java SE persistence units. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:element name="properties" minOccurs="0"> + <xsd:annotation> + <xsd:documentation> + + A list of vendor-specific properties. + + </xsd:documentation> + </xsd:annotation> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="property" + minOccurs="0" maxOccurs="unbounded"> + <xsd:annotation> + <xsd:documentation> + A name-value pair. + </xsd:documentation> + </xsd:annotation> + <xsd:complexType> + <xsd:attribute name="name" type="xsd:string" + use="required"/> + <xsd:attribute name="value" type="xsd:string" + use="required"/> + </xsd:complexType> + </xsd:element> + </xsd:sequence> + </xsd:complexType> + </xsd:element> + + </xsd:sequence> + + <!-- **************************************************** --> + + <xsd:attribute name="name" type="xsd:string" use="required"> + <xsd:annotation> + <xsd:documentation> + + Name used in code to reference this persistence unit. + + </xsd:documentation> + </xsd:annotation> + </xsd:attribute> + + <!-- **************************************************** --> + + <xsd:attribute name="transaction-type" + type="persistence:persistence-unit-transaction-type"> + <xsd:annotation> + <xsd:documentation> + + Type of transactions used by EntityManagers from this + persistence unit. + + </xsd:documentation> + </xsd:annotation> + </xsd:attribute> + + </xsd:complexType> + </xsd:element> + </xsd:sequence> + <xsd:attribute name="version" type="persistence:versionType" + fixed="1.0" use="required"/> + </xsd:complexType> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:simpleType name="persistence-unit-transaction-type"> + <xsd:annotation> + <xsd:documentation> + + public enum TransactionType { JTA, RESOURCE_LOCAL }; + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="JTA"/> + <xsd:enumeration value="RESOURCE_LOCAL"/> + </xsd:restriction> + </xsd:simpleType> + +</xsd:schema> + diff --git a/j2ee.persistence/external/j2ee.persistence-external-resources/persistence_2_0.xsd b/j2ee.persistence/external/j2ee.persistence-external-resources/persistence_2_0.xsd new file mode 100644 index 000000000..323bd8bc0 --- /dev/null +++ b/j2ee.persistence/external/j2ee.persistence-external-resources/persistence_2_0.xsd @@ -0,0 +1,355 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- persistence.xml schema --> +<xsd:schema targetNamespace="http://java.sun.com/xml/ns/persistence" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:persistence="http://java.sun.com/xml/ns/persistence" + elementFormDefault="qualified" + attributeFormDefault="unqualified" + version="2.0"> + + <xsd:annotation> + <xsd:documentation> + @(#)persistence_2_0.xsd 1.0 October 1 2009 + </xsd:documentation> + </xsd:annotation> + + <xsd:annotation> + <xsd:documentation> + + Copyright (c) 2008, 2009 Sun Microsystems. All rights reserved. + + This program and the accompanying materials are made available under the + terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0 + which accompanies this distribution. + The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html + and the Eclipse Distribution License is available at + http://www.eclipse.org/org/documents/edl-v10.php. + + Contributors: + Linda DeMichiel - Java Persistence 2.0, Version 2.0 (October 1, 2009) + Specification available from http://jcp.org/en/jsr/detail?id=317 + + </xsd:documentation> + </xsd:annotation> + + <xsd:annotation> + <xsd:documentation><![CDATA[ + + This is the XML Schema for the persistence configuration file. + The file must be named "META-INF/persistence.xml" in the + persistence archive. + + Persistence configuration files must indicate + the persistence schema by using the persistence namespace: + + http://java.sun.com/xml/ns/persistence + + and indicate the version of the schema by + using the version element as shown below: + + <persistence xmlns="http://java.sun.com/xml/ns/persistence" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence + http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" + version="2.0"> + ... + </persistence> + + ]]> + </xsd:documentation> + </xsd:annotation> + + <xsd:simpleType name="versionType"> + <xsd:restriction base="xsd:token"> + <xsd:pattern value="[0-9]+(\.[0-9]+)*"/> + </xsd:restriction> + </xsd:simpleType> + + <!-- **************************************************** --> + + <xsd:element name="persistence"> + <xsd:complexType> + <xsd:sequence> + + <!-- **************************************************** --> + + <xsd:element name="persistence-unit" + minOccurs="1" maxOccurs="unbounded"> + <xsd:complexType> + <xsd:annotation> + <xsd:documentation> + + Configuration of a persistence unit. + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + + <!-- **************************************************** --> + + <xsd:element name="description" type="xsd:string" + minOccurs="0"> + <xsd:annotation> + <xsd:documentation> + + Description of this persistence unit. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:element name="provider" type="xsd:string" + minOccurs="0"> + <xsd:annotation> + <xsd:documentation> + + Provider class that supplies EntityManagers for this + persistence unit. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:element name="jta-data-source" type="xsd:string" + minOccurs="0"> + <xsd:annotation> + <xsd:documentation> + + The container-specific name of the JTA datasource to use. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:element name="non-jta-data-source" type="xsd:string" + minOccurs="0"> + <xsd:annotation> + <xsd:documentation> + + The container-specific name of a non-JTA datasource to use. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:element name="mapping-file" type="xsd:string" + minOccurs="0" maxOccurs="unbounded"> + <xsd:annotation> + <xsd:documentation> + + File containing mapping information. Loaded as a resource + by the persistence provider. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:element name="jar-file" type="xsd:string" + minOccurs="0" maxOccurs="unbounded"> + <xsd:annotation> + <xsd:documentation> + + Jar file that is to be scanned for managed classes. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:element name="class" type="xsd:string" + minOccurs="0" maxOccurs="unbounded"> + <xsd:annotation> + <xsd:documentation> + + Managed class to be included in the persistence unit and + to scan for annotations. It should be annotated + with either @Entity, @Embeddable or @MappedSuperclass. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:element name="exclude-unlisted-classes" type="xsd:boolean" + default="true" minOccurs="0"> + <xsd:annotation> + <xsd:documentation> + + When set to true then only listed classes and jars will + be scanned for persistent classes, otherwise the + enclosing jar or directory will also be scanned. + Not applicable to Java SE persistence units. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:element name="shared-cache-mode" + type="persistence:persistence-unit-caching-type" + minOccurs="0"> + <xsd:annotation> + <xsd:documentation> + + Defines whether caching is enabled for the + persistence unit if caching is supported by the + persistence provider. When set to ALL, all entities + will be cached. When set to NONE, no entities will + be cached. When set to ENABLE_SELECTIVE, only entities + specified as cacheable will be cached. When set to + DISABLE_SELECTIVE, entities specified as not cacheable + will not be cached. When not specified or when set to + UNSPECIFIED, provider defaults may apply. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:element name="validation-mode" + type="persistence:persistence-unit-validation-mode-type" + minOccurs="0"> + <xsd:annotation> + <xsd:documentation> + + The validation mode to be used for the persistence unit. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + + <!-- **************************************************** --> + + <xsd:element name="properties" minOccurs="0"> + <xsd:annotation> + <xsd:documentation> + + A list of standard and vendor-specific properties + and hints. + + </xsd:documentation> + </xsd:annotation> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="property" + minOccurs="0" maxOccurs="unbounded"> + <xsd:annotation> + <xsd:documentation> + A name-value pair. + </xsd:documentation> + </xsd:annotation> + <xsd:complexType> + <xsd:attribute name="name" type="xsd:string" + use="required"/> + <xsd:attribute name="value" type="xsd:string" + use="required"/> + </xsd:complexType> + </xsd:element> + </xsd:sequence> + </xsd:complexType> + </xsd:element> + + </xsd:sequence> + + <!-- **************************************************** --> + + <xsd:attribute name="name" type="xsd:string" use="required"> + <xsd:annotation> + <xsd:documentation> + + Name used in code to reference this persistence unit. + + </xsd:documentation> + </xsd:annotation> + </xsd:attribute> + + <!-- **************************************************** --> + + <xsd:attribute name="transaction-type" + type="persistence:persistence-unit-transaction-type"> + <xsd:annotation> + <xsd:documentation> + + Type of transactions used by EntityManagers from this + persistence unit. + + </xsd:documentation> + </xsd:annotation> + </xsd:attribute> + + </xsd:complexType> + </xsd:element> + </xsd:sequence> + <xsd:attribute name="version" type="persistence:versionType" + fixed="2.0" use="required"/> + </xsd:complexType> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:simpleType name="persistence-unit-transaction-type"> + <xsd:annotation> + <xsd:documentation> + + public enum PersistenceUnitTransactionType {JTA, RESOURCE_LOCAL}; + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="JTA"/> + <xsd:enumeration value="RESOURCE_LOCAL"/> + </xsd:restriction> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:simpleType name="persistence-unit-caching-type"> + <xsd:annotation> + <xsd:documentation> + + public enum SharedCacheMode { ALL, NONE, ENABLE_SELECTIVE, DISABLE_SELECTIVE, UNSPECIFIED}; + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="ALL"/> + <xsd:enumeration value="NONE"/> + <xsd:enumeration value="ENABLE_SELECTIVE"/> + <xsd:enumeration value="DISABLE_SELECTIVE"/> + <xsd:enumeration value="UNSPECIFIED"/> + </xsd:restriction> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:simpleType name="persistence-unit-validation-mode-type"> + <xsd:annotation> + <xsd:documentation> + + public enum ValidationMode { AUTO, CALLBACK, NONE}; + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="AUTO"/> + <xsd:enumeration value="CALLBACK"/> + <xsd:enumeration value="NONE"/> + </xsd:restriction> + </xsd:simpleType> + +</xsd:schema> diff --git a/j2ee.persistence/external/j2ee.persistence-external-resources/persistence_2_1.xsd b/j2ee.persistence/external/j2ee.persistence-external-resources/persistence_2_1.xsd new file mode 100644 index 000000000..01d514902 --- /dev/null +++ b/j2ee.persistence/external/j2ee.persistence-external-resources/persistence_2_1.xsd @@ -0,0 +1,354 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- persistence.xml schema --> +<xsd:schema targetNamespace="http://xmlns.jcp.org/xml/ns/persistence" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:persistence="http://xmlns.jcp.org/xml/ns/persistence" + elementFormDefault="qualified" + attributeFormDefault="unqualified" + version="2.1"> + + <xsd:annotation> + <xsd:documentation> + @(#)persistence_2_1.xsd 2.1 February 4, 2013 + </xsd:documentation> + </xsd:annotation> + + <xsd:annotation> + <xsd:documentation> + + Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved. + + This program and the accompanying materials are made available under the + terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0 + which accompanies this distribution. + The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html + and the Eclipse Distribution License is available at + http://www.eclipse.org/org/documents/edl-v10.php. + + Contributors: + Linda DeMichiel - Java Persistence 2.1, Version 2.1 (February 4, 2013) + Specification available from http://jcp.org/en/jsr/detail?id=338 + + </xsd:documentation> + </xsd:annotation> + + <xsd:annotation> + <xsd:documentation><![CDATA[ + + This is the XML Schema for the persistence configuration file. + The file must be named "META-INF/persistence.xml" in the + persistence archive. + + Persistence configuration files must indicate + the persistence schema by using the persistence namespace: + + http://xmlns.jcp.org/xml/ns/persistence + + and indicate the version of the schema by + using the version element as shown below: + + <persistence xmlns="http://xmlns.jcp.org/xml/ns/persistence" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence + http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd" + version="2.1"> + ... + </persistence> + + ]]></xsd:documentation> + </xsd:annotation> + + <xsd:simpleType name="versionType"> + <xsd:restriction base="xsd:token"> + <xsd:pattern value="[0-9]+(\.[0-9]+)*"/> + </xsd:restriction> + </xsd:simpleType> + + <!-- **************************************************** --> + + <xsd:element name="persistence"> + <xsd:complexType> + <xsd:sequence> + + <!-- **************************************************** --> + + <xsd:element name="persistence-unit" + minOccurs="1" maxOccurs="unbounded"> + <xsd:complexType> + <xsd:annotation> + <xsd:documentation> + + Configuration of a persistence unit. + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + + <!-- **************************************************** --> + + <xsd:element name="description" type="xsd:string" + minOccurs="0"> + <xsd:annotation> + <xsd:documentation> + + Description of this persistence unit. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:element name="provider" type="xsd:string" + minOccurs="0"> + <xsd:annotation> + <xsd:documentation> + + Provider class that supplies EntityManagers for this + persistence unit. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:element name="jta-data-source" type="xsd:string" + minOccurs="0"> + <xsd:annotation> + <xsd:documentation> + + The container-specific name of the JTA datasource to use. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:element name="non-jta-data-source" type="xsd:string" + minOccurs="0"> + <xsd:annotation> + <xsd:documentation> + + The container-specific name of a non-JTA datasource to use. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:element name="mapping-file" type="xsd:string" + minOccurs="0" maxOccurs="unbounded"> + <xsd:annotation> + <xsd:documentation> + + File containing mapping information. Loaded as a resource + by the persistence provider. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:element name="jar-file" type="xsd:string" + minOccurs="0" maxOccurs="unbounded"> + <xsd:annotation> + <xsd:documentation> + + Jar file that is to be scanned for managed classes. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:element name="class" type="xsd:string" + minOccurs="0" maxOccurs="unbounded"> + <xsd:annotation> + <xsd:documentation> + + Managed class to be included in the persistence unit and + to scan for annotations. It should be annotated + with either @Entity, @Embeddable or @MappedSuperclass. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:element name="exclude-unlisted-classes" type="xsd:boolean" + default="true" minOccurs="0"> + <xsd:annotation> + <xsd:documentation> + + When set to true then only listed classes and jars will + be scanned for persistent classes, otherwise the + enclosing jar or directory will also be scanned. + Not applicable to Java SE persistence units. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:element name="shared-cache-mode" + type="persistence:persistence-unit-caching-type" + minOccurs="0"> + <xsd:annotation> + <xsd:documentation> + + Defines whether caching is enabled for the + persistence unit if caching is supported by the + persistence provider. When set to ALL, all entities + will be cached. When set to NONE, no entities will + be cached. When set to ENABLE_SELECTIVE, only entities + specified as cacheable will be cached. When set to + DISABLE_SELECTIVE, entities specified as not cacheable + will not be cached. When not specified or when set to + UNSPECIFIED, provider defaults may apply. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:element name="validation-mode" + type="persistence:persistence-unit-validation-mode-type" + minOccurs="0"> + <xsd:annotation> + <xsd:documentation> + + The validation mode to be used for the persistence unit. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + + <!-- **************************************************** --> + + <xsd:element name="properties" minOccurs="0"> + <xsd:annotation> + <xsd:documentation> + + A list of standard and vendor-specific properties + and hints. + + </xsd:documentation> + </xsd:annotation> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="property" + minOccurs="0" maxOccurs="unbounded"> + <xsd:annotation> + <xsd:documentation> + A name-value pair. + </xsd:documentation> + </xsd:annotation> + <xsd:complexType> + <xsd:attribute name="name" type="xsd:string" + use="required"/> + <xsd:attribute name="value" type="xsd:string" + use="required"/> + </xsd:complexType> + </xsd:element> + </xsd:sequence> + </xsd:complexType> + </xsd:element> + + </xsd:sequence> + + <!-- **************************************************** --> + + <xsd:attribute name="name" type="xsd:string" use="required"> + <xsd:annotation> + <xsd:documentation> + + Name used in code to reference this persistence unit. + + </xsd:documentation> + </xsd:annotation> + </xsd:attribute> + + <!-- **************************************************** --> + + <xsd:attribute name="transaction-type" + type="persistence:persistence-unit-transaction-type"> + <xsd:annotation> + <xsd:documentation> + + Type of transactions used by EntityManagers from this + persistence unit. + + </xsd:documentation> + </xsd:annotation> + </xsd:attribute> + + </xsd:complexType> + </xsd:element> + </xsd:sequence> + <xsd:attribute name="version" type="persistence:versionType" + fixed="2.1" use="required"/> + </xsd:complexType> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:simpleType name="persistence-unit-transaction-type"> + <xsd:annotation> + <xsd:documentation> + + public enum PersistenceUnitTransactionType {JTA, RESOURCE_LOCAL}; + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="JTA"/> + <xsd:enumeration value="RESOURCE_LOCAL"/> + </xsd:restriction> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:simpleType name="persistence-unit-caching-type"> + <xsd:annotation> + <xsd:documentation> + + public enum SharedCacheMode { ALL, NONE, ENABLE_SELECTIVE, DISABLE_SELECTIVE, UNSPECIFIED}; + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="ALL"/> + <xsd:enumeration value="NONE"/> + <xsd:enumeration value="ENABLE_SELECTIVE"/> + <xsd:enumeration value="DISABLE_SELECTIVE"/> + <xsd:enumeration value="UNSPECIFIED"/> + </xsd:restriction> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:simpleType name="persistence-unit-validation-mode-type"> + <xsd:annotation> + <xsd:documentation> + + public enum ValidationMode { AUTO, CALLBACK, NONE}; + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="AUTO"/> + <xsd:enumeration value="CALLBACK"/> + <xsd:enumeration value="NONE"/> + </xsd:restriction> + </xsd:simpleType> + +</xsd:schema> diff --git a/j2ee.persistence/l10n.list b/j2ee.persistence/l10n.list index 413b7b15c..77443d1e7 100644 --- a/j2ee.persistence/l10n.list +++ b/j2ee.persistence/l10n.list @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# # j2ee/persistence read global ${l10n-module}/src/org/netbeans/modules/j2ee/persistence/wizard/dao/*.html diff --git a/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/common/Bundle.properties b/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/common/Bundle.properties index a577bf1a7..0fe84882b 100644 --- a/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/common/Bundle.properties +++ b/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/common/Bundle.properties @@ -1,46 +1,19 @@ -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -# -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. -# -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# Contributor(s): -# -# The Original Software is Forte for Java, Community Edition. The Initial -# Developer of the Original Software is Sun Microsystems, Inc. Portions -# Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. -# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. #ParseUtils MSG_cannotParse=Cannot parse deployment descriptor file: diff --git a/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/resources/orm_1_0.xsd b/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/resources/orm_1_0.xsd new file mode 100644 index 000000000..0d65647c9 --- /dev/null +++ b/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/resources/orm_1_0.xsd @@ -0,0 +1,1564 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Java Persistence API object-relational mapping file schema --> +<xsd:schema targetNamespace="http://java.sun.com/xml/ns/persistence/orm" + xmlns:orm="http://java.sun.com/xml/ns/persistence/orm" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + elementFormDefault="qualified" + attributeFormDefault="unqualified" + version="1.0"> + + <xsd:annotation> + <xsd:documentation> + @(#)orm_1_0.xsd 1.0 Feb 14 2006 + </xsd:documentation> + </xsd:annotation> + + <xsd:annotation> + <xsd:documentation> + + DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + + Copyright 2005-2010 Oracle and/or its affiliates. All rights reserved. + +Oracle and Java are registered trademarks of Oracle and/or its affiliates. +Other names may be trademarks of their respective owners. + + The contents of this file are subject to the terms of either the + GNU General Public License Version 2 only ("GPL") or the Common + Development and Distribution License("CDDL") (collectively, the + "License"). You may not use this file except in compliance with + the License. You can obtain a copy of the License at + https://glassfish.dev.java.net/public/CDDL+GPL.html or + glassfish/bootstrap/legal/LICENSE.txt. See the License for the + specific language governing permissions and limitations under the + License. + + When distributing the software, include this License Header + Notice in each file and include the License file at + glassfish/bootstrap/legal/LICENSE.txt. Sun designates this + particular file as subject to the "Classpath" exception as + provided by Oracle in the GPL Version 2 section of the License file + that accompanied this code. If applicable, add the following + below the License Header, with the fields enclosed by brackets [] + replaced by your own identifying information: + "Portions Copyrighted [year] [name of copyright owner]" + + Contributor(s): + + If you wish your version of this file to be governed by only the + CDDL or only the GPL Version 2, indicate your decision by adding + "[Contributor] elects to include this software in this + distribution under the [CDDL or GPL Version 2] license." If you + don't indicate a single choice of license, a recipient has the + option to distribute your version of this file under either the + CDDL, the GPL Version 2 or to extend the choice of license to its + licensees as provided above. However, if you add GPL Version 2 + code and therefore, elected the GPL Version 2 license, then the + option applies only if the new code is made subject to such + option by the copyright holder. + + </xsd:documentation> + </xsd:annotation> + + <xsd:annotation> + <xsd:documentation><![CDATA[ + + This is the XML Schema for the persistence object-relational + mapping file. + The file may be named "META-INF/orm.xml" in the persistence + archive or it may be named some other name which would be + used to locate the file as resource on the classpath. + + ]]></xsd:documentation> + </xsd:annotation> + + <xsd:complexType name="emptyType"/> + + <xsd:simpleType name="versionType"> + <xsd:restriction base="xsd:token"> + <xsd:pattern value="[0-9]+(\.[0-9]+)*"/> + </xsd:restriction> + </xsd:simpleType> + + <!-- **************************************************** --> + + <xsd:element name="entity-mappings"> + <xsd:complexType> + <xsd:annotation> + <xsd:documentation> + + The entity-mappings element is the root element of an mapping + file. It contains the following four types of elements: + + 1. The persistence-unit-metadata element contains metadata + for the entire persistence unit. It is undefined if this element + occurs in multiple mapping files within the same persistence unit. + + 2. The package, schema, catalog and access elements apply to all of + the entity, mapped-superclass and embeddable elements defined in + the same file in which they occur. + + 3. The sequence-generator, table-generator, named-query, + named-native-query and sql-result-set-mapping elements are global + to the persistence unit. It is undefined to have more than one + sequence-generator or table-generator of the same name in the same + or different mapping files in a persistence unit. It is also + undefined to have more than one named-query or named-native-query + of the same name in the same or different mapping files in a + persistence unit. + + 4. The entity, mapped-superclass and embeddable elements each define + the mapping information for a managed persistent class. The mapping + information contained in these elements may be complete or it may + be partial. + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" + minOccurs="0"/> + <xsd:element name="persistence-unit-metadata" + type="orm:persistence-unit-metadata" + minOccurs="0"/> + <xsd:element name="package" type="xsd:string" + minOccurs="0"/> + <xsd:element name="schema" type="xsd:string" + minOccurs="0"/> + <xsd:element name="catalog" type="xsd:string" + minOccurs="0"/> + <xsd:element name="access" type="orm:access-type" + minOccurs="0"/> + <xsd:element name="sequence-generator" type="orm:sequence-generator" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="table-generator" type="orm:table-generator" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="named-query" type="orm:named-query" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="named-native-query" type="orm:named-native-query" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="sql-result-set-mapping" + type="orm:sql-result-set-mapping" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="mapped-superclass" type="orm:mapped-superclass" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="entity" type="orm:entity" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="embeddable" type="orm:embeddable" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="version" type="orm:versionType" + fixed="1.0" use="required"/> + </xsd:complexType> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:complexType name="persistence-unit-metadata"> + <xsd:annotation> + <xsd:documentation> + + Metadata that applies to the persistence unit and not just to + the mapping file in which it is contained. + + If the xml-mapping-metadata-complete element is specified then + the complete set of mapping metadata for the persistence unit + is contained in the XML mapping files for the persistence unit. + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="xml-mapping-metadata-complete" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="persistence-unit-defaults" + type="orm:persistence-unit-defaults" + minOccurs="0"/> + </xsd:sequence> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="persistence-unit-defaults"> + <xsd:annotation> + <xsd:documentation> + + These defaults are applied to the persistence unit as a whole + unless they are overridden by local annotation or XML + element settings. + + schema - Used as the schema for all tables or secondary tables + that apply to the persistence unit + catalog - Used as the catalog for all tables or secondary tables + that apply to the persistence unit + access - Used as the access type for all managed classes in + the persistence unit + cascade-persist - Adds cascade-persist to the set of cascade options + in entity relationships of the persistence unit + entity-listeners - List of default entity listeners to be invoked + on each entity in the persistence unit. + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="schema" type="xsd:string" + minOccurs="0"/> + <xsd:element name="catalog" type="xsd:string" + minOccurs="0"/> + <xsd:element name="access" type="orm:access-type" + minOccurs="0"/> + <xsd:element name="cascade-persist" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="entity-listeners" type="orm:entity-listeners" + minOccurs="0"/> + </xsd:sequence> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="entity"> + <xsd:annotation> + <xsd:documentation> + + Defines the settings and mappings for an entity. Is allowed to be + sparsely populated and used in conjunction with the annotations. + Alternatively, the metadata-complete attribute can be used to + indicate that no annotations on the entity class (and its fields + or properties) are to be processed. If this is the case then + the defaulting rules for the entity and its subelements will + be recursively applied. + + @Target(TYPE) @Retention(RUNTIME) + public @interface Entity { + String name() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:element name="table" type="orm:table" + minOccurs="0"/> + <xsd:element name="secondary-table" type="orm:secondary-table" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="primary-key-join-column" + type="orm:primary-key-join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="id-class" type="orm:id-class" minOccurs="0"/> + <xsd:element name="inheritance" type="orm:inheritance" minOccurs="0"/> + <xsd:element name="discriminator-value" type="orm:discriminator-value" + minOccurs="0"/> + <xsd:element name="discriminator-column" + type="orm:discriminator-column" + minOccurs="0"/> + <xsd:element name="sequence-generator" type="orm:sequence-generator" + minOccurs="0"/> + <xsd:element name="table-generator" type="orm:table-generator" + minOccurs="0"/> + <xsd:element name="named-query" type="orm:named-query" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="named-native-query" type="orm:named-native-query" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="sql-result-set-mapping" + type="orm:sql-result-set-mapping" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="exclude-default-listeners" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="exclude-superclass-listeners" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="entity-listeners" type="orm:entity-listeners" + minOccurs="0"/> + <xsd:element name="pre-persist" type="orm:pre-persist" minOccurs="0"/> + <xsd:element name="post-persist" type="orm:post-persist" + minOccurs="0"/> + <xsd:element name="pre-remove" type="orm:pre-remove" minOccurs="0"/> + <xsd:element name="post-remove" type="orm:post-remove" minOccurs="0"/> + <xsd:element name="pre-update" type="orm:pre-update" minOccurs="0"/> + <xsd:element name="post-update" type="orm:post-update" minOccurs="0"/> + <xsd:element name="post-load" type="orm:post-load" minOccurs="0"/> + <xsd:element name="attribute-override" type="orm:attribute-override" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="association-override" + type="orm:association-override" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="attributes" type="orm:attributes" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="class" type="xsd:string" use="required"/> + <xsd:attribute name="access" type="orm:access-type"/> + <xsd:attribute name="metadata-complete" type="xsd:boolean"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="attributes"> + <xsd:annotation> + <xsd:documentation> + + This element contains the entity field or property mappings. + It may be sparsely populated to include only a subset of the + fields or properties. If metadata-complete for the entity is true + then the remainder of the attributes will be defaulted according + to the default rules. + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:choice> + <xsd:element name="id" type="orm:id" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="embedded-id" type="orm:embedded-id" + minOccurs="0"/> + </xsd:choice> + <xsd:element name="basic" type="orm:basic" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="version" type="orm:version" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="many-to-one" type="orm:many-to-one" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="one-to-many" type="orm:one-to-many" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="one-to-one" type="orm:one-to-one" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="many-to-many" type="orm:many-to-many" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="embedded" type="orm:embedded" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="transient" type="orm:transient" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:simpleType name="access-type"> + <xsd:annotation> + <xsd:documentation> + + This element determines how the persistence provider accesses the + state of an entity or embedded object. + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="PROPERTY"/> + <xsd:enumeration value="FIELD"/> + </xsd:restriction> + </xsd:simpleType> + + <!-- **************************************************** --> + + <xsd:complexType name="entity-listeners"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface EntityListeners { + Class[] value(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="entity-listener" type="orm:entity-listener" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="entity-listener"> + <xsd:annotation> + <xsd:documentation> + + Defines an entity listener to be invoked at lifecycle events + for the entities that list this listener. + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="pre-persist" type="orm:pre-persist" minOccurs="0"/> + <xsd:element name="post-persist" type="orm:post-persist" + minOccurs="0"/> + <xsd:element name="pre-remove" type="orm:pre-remove" minOccurs="0"/> + <xsd:element name="post-remove" type="orm:post-remove" minOccurs="0"/> + <xsd:element name="pre-update" type="orm:pre-update" minOccurs="0"/> + <xsd:element name="post-update" type="orm:post-update" minOccurs="0"/> + <xsd:element name="post-load" type="orm:post-load" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="class" type="xsd:string" use="required"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="pre-persist"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PrePersist {} + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="method-name" type="xsd:string" use="required"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="post-persist"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PostPersist {} + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="method-name" type="xsd:string" use="required"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="pre-remove"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PreRemove {} + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="method-name" type="xsd:string" use="required"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="post-remove"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PostRemove {} + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="method-name" type="xsd:string" use="required"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="pre-update"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PreUpdate {} + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="method-name" type="xsd:string" use="required"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="post-update"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PostUpdate {} + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="method-name" type="xsd:string" use="required"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="post-load"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PostLoad {} + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="method-name" type="xsd:string" use="required"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="query-hint"> + <xsd:annotation> + <xsd:documentation> + + @Target({}) @Retention(RUNTIME) + public @interface QueryHint { + String name(); + String value(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="value" type="xsd:string" use="required"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="named-query"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface NamedQuery { + String name(); + String query(); + QueryHint[] hints() default {}; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="query" type="xsd:string"/> + <xsd:element name="hint" type="orm:query-hint" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="named-native-query"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface NamedNativeQuery { + String name(); + String query(); + QueryHint[] hints() default {}; + Class resultClass() default void.class; + String resultSetMapping() default ""; //named SqlResultSetMapping + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="query" type="xsd:string"/> + <xsd:element name="hint" type="orm:query-hint" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="result-class" type="xsd:string"/> + <xsd:attribute name="result-set-mapping" type="xsd:string"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="sql-result-set-mapping"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface SqlResultSetMapping { + String name(); + EntityResult[] entities() default {}; + ColumnResult[] columns() default {}; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="entity-result" type="orm:entity-result" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="column-result" type="orm:column-result" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="entity-result"> + <xsd:annotation> + <xsd:documentation> + + @Target({}) @Retention(RUNTIME) + public @interface EntityResult { + Class entityClass(); + FieldResult[] fields() default {}; + String discriminatorColumn() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="field-result" type="orm:field-result" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="entity-class" type="xsd:string" use="required"/> + <xsd:attribute name="discriminator-column" type="xsd:string"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="field-result"> + <xsd:annotation> + <xsd:documentation> + + @Target({}) @Retention(RUNTIME) + public @interface FieldResult { + String name(); + String column(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="column" type="xsd:string" use="required"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="column-result"> + <xsd:annotation> + <xsd:documentation> + + @Target({}) @Retention(RUNTIME) + public @interface ColumnResult { + String name(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string" use="required"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="table"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface Table { + String name() default ""; + String catalog() default ""; + String schema() default ""; + UniqueConstraint[] uniqueConstraints() default {}; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="unique-constraint" type="orm:unique-constraint" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="catalog" type="xsd:string"/> + <xsd:attribute name="schema" type="xsd:string"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="secondary-table"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface SecondaryTable { + String name(); + String catalog() default ""; + String schema() default ""; + PrimaryKeyJoinColumn[] pkJoinColumns() default {}; + UniqueConstraint[] uniqueConstraints() default {}; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="primary-key-join-column" + type="orm:primary-key-join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="unique-constraint" type="orm:unique-constraint" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="catalog" type="xsd:string"/> + <xsd:attribute name="schema" type="xsd:string"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="unique-constraint"> + <xsd:annotation> + <xsd:documentation> + + @Target({}) @Retention(RUNTIME) + public @interface UniqueConstraint { + String[] columnNames(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="column-name" type="xsd:string" + maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="column"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Column { + String name() default ""; + boolean unique() default false; + boolean nullable() default true; + boolean insertable() default true; + boolean updatable() default true; + String columnDefinition() default ""; + String table() default ""; + int length() default 255; + int precision() default 0; // decimal precision + int scale() default 0; // decimal scale + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="unique" type="xsd:boolean"/> + <xsd:attribute name="nullable" type="xsd:boolean"/> + <xsd:attribute name="insertable" type="xsd:boolean"/> + <xsd:attribute name="updatable" type="xsd:boolean"/> + <xsd:attribute name="column-definition" type="xsd:string"/> + <xsd:attribute name="table" type="xsd:string"/> + <xsd:attribute name="length" type="xsd:int"/> + <xsd:attribute name="precision" type="xsd:int"/> + <xsd:attribute name="scale" type="xsd:int"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="join-column"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface JoinColumn { + String name() default ""; + String referencedColumnName() default ""; + boolean unique() default false; + boolean nullable() default true; + boolean insertable() default true; + boolean updatable() default true; + String columnDefinition() default ""; + String table() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="referenced-column-name" type="xsd:string"/> + <xsd:attribute name="unique" type="xsd:boolean"/> + <xsd:attribute name="nullable" type="xsd:boolean"/> + <xsd:attribute name="insertable" type="xsd:boolean"/> + <xsd:attribute name="updatable" type="xsd:boolean"/> + <xsd:attribute name="column-definition" type="xsd:string"/> + <xsd:attribute name="table" type="xsd:string"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:simpleType name="generation-type"> + <xsd:annotation> + <xsd:documentation> + + public enum GenerationType { TABLE, SEQUENCE, IDENTITY, AUTO }; + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="TABLE"/> + <xsd:enumeration value="SEQUENCE"/> + <xsd:enumeration value="IDENTITY"/> + <xsd:enumeration value="AUTO"/> + </xsd:restriction> + </xsd:simpleType> + + <!-- **************************************************** --> + + <xsd:complexType name="attribute-override"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME) + public @interface AttributeOverride { + String name(); + Column column(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="column" type="orm:column"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="association-override"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME) + public @interface AssociationOverride { + String name(); + JoinColumn[] joinColumns(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="join-column" type="orm:join-column" + maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="id-class"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface IdClass { + Class value(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="class" type="xsd:string" use="required"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="id"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Id {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="column" type="orm:column" + minOccurs="0"/> + <xsd:element name="generated-value" type="orm:generated-value" + minOccurs="0"/> + <xsd:element name="temporal" type="orm:temporal" + minOccurs="0"/> + <xsd:element name="table-generator" type="orm:table-generator" + minOccurs="0"/> + <xsd:element name="sequence-generator" type="orm:sequence-generator" + minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="embedded-id"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface EmbeddedId {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="attribute-override" type="orm:attribute-override" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="transient"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Transient {} + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string" use="required"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="version"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Version {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="column" type="orm:column" minOccurs="0"/> + <xsd:element name="temporal" type="orm:temporal" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="basic"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Basic { + FetchType fetch() default EAGER; + boolean optional() default true; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="column" type="orm:column" minOccurs="0"/> + <xsd:choice> + <xsd:element name="lob" type="orm:lob" minOccurs="0"/> + <xsd:element name="temporal" type="orm:temporal" minOccurs="0"/> + <xsd:element name="enumerated" type="orm:enumerated" minOccurs="0"/> + </xsd:choice> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="fetch" type="orm:fetch-type"/> + <xsd:attribute name="optional" type="xsd:boolean"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:simpleType name="fetch-type"> + <xsd:annotation> + <xsd:documentation> + + public enum FetchType { LAZY, EAGER }; + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="LAZY"/> + <xsd:enumeration value="EAGER"/> + </xsd:restriction> + </xsd:simpleType> + + <!-- **************************************************** --> + + <xsd:complexType name="lob"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Lob {} + + </xsd:documentation> + </xsd:annotation> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:simpleType name="temporal"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Temporal { + TemporalType value(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="orm:temporal-type"/> + </xsd:simpleType> + + <!-- **************************************************** --> + + <xsd:simpleType name="temporal-type"> + <xsd:annotation> + <xsd:documentation> + + public enum TemporalType { + DATE, // java.sql.Date + TIME, // java.sql.Time + TIMESTAMP // java.sql.Timestamp + } + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="DATE"/> + <xsd:enumeration value="TIME"/> + <xsd:enumeration value="TIMESTAMP"/> + </xsd:restriction> + </xsd:simpleType> + + <!-- **************************************************** --> + + <xsd:simpleType name="enumerated"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Enumerated { + EnumType value() default ORDINAL; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="orm:enum-type"/> + </xsd:simpleType> + + <!-- **************************************************** --> + + <xsd:simpleType name="enum-type"> + <xsd:annotation> + <xsd:documentation> + + public enum EnumType { + ORDINAL, + STRING + } + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="ORDINAL"/> + <xsd:enumeration value="STRING"/> + </xsd:restriction> + </xsd:simpleType> + + <!-- **************************************************** --> + + <xsd:complexType name="many-to-one"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface ManyToOne { + Class targetEntity() default void.class; + CascadeType[] cascade() default {}; + FetchType fetch() default EAGER; + boolean optional() default true; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:choice> + <xsd:element name="join-column" type="orm:join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="join-table" type="orm:join-table" + minOccurs="0"/> + </xsd:choice> + <xsd:element name="cascade" type="orm:cascade-type" + minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="target-entity" type="xsd:string"/> + <xsd:attribute name="fetch" type="orm:fetch-type"/> + <xsd:attribute name="optional" type="xsd:boolean"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="cascade-type"> + <xsd:annotation> + <xsd:documentation> + + public enum CascadeType { ALL, PERSIST, MERGE, REMOVE, REFRESH}; + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="cascade-all" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="cascade-persist" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="cascade-merge" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="cascade-remove" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="cascade-refresh" type="orm:emptyType" + minOccurs="0"/> + </xsd:sequence> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="one-to-one"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface OneToOne { + Class targetEntity() default void.class; + CascadeType[] cascade() default {}; + FetchType fetch() default EAGER; + boolean optional() default true; + String mappedBy() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:choice> + <xsd:element name="primary-key-join-column" + type="orm:primary-key-join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="join-column" type="orm:join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="join-table" type="orm:join-table" + minOccurs="0"/> + </xsd:choice> + <xsd:element name="cascade" type="orm:cascade-type" + minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="target-entity" type="xsd:string"/> + <xsd:attribute name="fetch" type="orm:fetch-type"/> + <xsd:attribute name="optional" type="xsd:boolean"/> + <xsd:attribute name="mapped-by" type="xsd:string"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="one-to-many"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface OneToMany { + Class targetEntity() default void.class; + CascadeType[] cascade() default {}; + FetchType fetch() default LAZY; + String mappedBy() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="order-by" type="orm:order-by" + minOccurs="0"/> + <xsd:element name="map-key" type="orm:map-key" + minOccurs="0"/> + <xsd:choice> + <xsd:element name="join-table" type="orm:join-table" + minOccurs="0"/> + <xsd:element name="join-column" type="orm:join-column" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:choice> + <xsd:element name="cascade" type="orm:cascade-type" + minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="target-entity" type="xsd:string"/> + <xsd:attribute name="fetch" type="orm:fetch-type"/> + <xsd:attribute name="mapped-by" type="xsd:string"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="join-table"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface JoinTable { + String name() default ""; + String catalog() default ""; + String schema() default ""; + JoinColumn[] joinColumns() default {}; + JoinColumn[] inverseJoinColumns() default {}; + UniqueConstraint[] uniqueConstraints() default {}; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="join-column" type="orm:join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="inverse-join-column" type="orm:join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="unique-constraint" type="orm:unique-constraint" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="catalog" type="xsd:string"/> + <xsd:attribute name="schema" type="xsd:string"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="many-to-many"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface ManyToMany { + Class targetEntity() default void.class; + CascadeType[] cascade() default {}; + FetchType fetch() default LAZY; + String mappedBy() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="order-by" type="orm:order-by" + minOccurs="0"/> + <xsd:element name="map-key" type="orm:map-key" + minOccurs="0"/> + <xsd:element name="join-table" type="orm:join-table" + minOccurs="0"/> + <xsd:element name="cascade" type="orm:cascade-type" + minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="target-entity" type="xsd:string"/> + <xsd:attribute name="fetch" type="orm:fetch-type"/> + <xsd:attribute name="mapped-by" type="xsd:string"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="generated-value"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface GeneratedValue { + GenerationType strategy() default AUTO; + String generator() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="strategy" type="orm:generation-type"/> + <xsd:attribute name="generator" type="xsd:string"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="map-key"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface MapKey { + String name() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:simpleType name="order-by"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface OrderBy { + String value() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:string"/> + </xsd:simpleType> + + <!-- **************************************************** --> + + <xsd:complexType name="inheritance"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface Inheritance { + InheritanceType strategy() default SINGLE_TABLE; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="strategy" type="orm:inheritance-type"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:simpleType name="inheritance-type"> + <xsd:annotation> + <xsd:documentation> + + public enum InheritanceType + { SINGLE_TABLE, JOINED, TABLE_PER_CLASS}; + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="SINGLE_TABLE"/> + <xsd:enumeration value="JOINED"/> + <xsd:enumeration value="TABLE_PER_CLASS"/> + </xsd:restriction> + </xsd:simpleType> + + <!-- **************************************************** --> + + <xsd:simpleType name="discriminator-value"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface DiscriminatorValue { + String value(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:string"/> + </xsd:simpleType> + + <!-- **************************************************** --> + + <xsd:simpleType name="discriminator-type"> + <xsd:annotation> + <xsd:documentation> + + public enum DiscriminatorType { STRING, CHAR, INTEGER }; + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="STRING"/> + <xsd:enumeration value="CHAR"/> + <xsd:enumeration value="INTEGER"/> + </xsd:restriction> + </xsd:simpleType> + + <!-- **************************************************** --> + + <xsd:complexType name="primary-key-join-column"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME) + public @interface PrimaryKeyJoinColumn { + String name() default ""; + String referencedColumnName() default ""; + String columnDefinition() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="referenced-column-name" type="xsd:string"/> + <xsd:attribute name="column-definition" type="xsd:string"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="discriminator-column"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface DiscriminatorColumn { + String name() default "DTYPE"; + DiscriminatorType discriminatorType() default STRING; + String columnDefinition() default ""; + int length() default 31; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="discriminator-type" type="orm:discriminator-type"/> + <xsd:attribute name="column-definition" type="xsd:string"/> + <xsd:attribute name="length" type="xsd:int"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="embeddable"> + <xsd:annotation> + <xsd:documentation> + + Defines the settings and mappings for embeddable objects. Is + allowed to be sparsely populated and used in conjunction with + the annotations. Alternatively, the metadata-complete attribute + can be used to indicate that no annotations are to be processed + in the class. If this is the case then the defaulting rules will + be recursively applied. + + @Target({TYPE}) @Retention(RUNTIME) + public @interface Embeddable {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:element name="attributes" type="orm:embeddable-attributes" + minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="class" type="xsd:string" use="required"/> + <xsd:attribute name="access" type="orm:access-type"/> + <xsd:attribute name="metadata-complete" type="xsd:boolean"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="embeddable-attributes"> + <xsd:sequence> + <xsd:element name="basic" type="orm:basic" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="transient" type="orm:transient" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="embedded"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Embedded {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="attribute-override" type="orm:attribute-override" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="mapped-superclass"> + <xsd:annotation> + <xsd:documentation> + + Defines the settings and mappings for a mapped superclass. Is + allowed to be sparsely populated and used in conjunction with + the annotations. Alternatively, the metadata-complete attribute + can be used to indicate that no annotations are to be processed + If this is the case then the defaulting rules will be recursively + applied. + + @Target(TYPE) @Retention(RUNTIME) + public @interface MappedSuperclass{} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:element name="id-class" type="orm:id-class" minOccurs="0"/> + <xsd:element name="exclude-default-listeners" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="exclude-superclass-listeners" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="entity-listeners" type="orm:entity-listeners" + minOccurs="0"/> + <xsd:element name="pre-persist" type="orm:pre-persist" minOccurs="0"/> + <xsd:element name="post-persist" type="orm:post-persist" + minOccurs="0"/> + <xsd:element name="pre-remove" type="orm:pre-remove" minOccurs="0"/> + <xsd:element name="post-remove" type="orm:post-remove" minOccurs="0"/> + <xsd:element name="pre-update" type="orm:pre-update" minOccurs="0"/> + <xsd:element name="post-update" type="orm:post-update" minOccurs="0"/> + <xsd:element name="post-load" type="orm:post-load" minOccurs="0"/> + <xsd:element name="attributes" type="orm:attributes" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="class" type="xsd:string" use="required"/> + <xsd:attribute name="access" type="orm:access-type"/> + <xsd:attribute name="metadata-complete" type="xsd:boolean"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="sequence-generator"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME) + public @interface SequenceGenerator { + String name(); + String sequenceName() default ""; + int initialValue() default 1; + int allocationSize() default 50; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="sequence-name" type="xsd:string"/> + <xsd:attribute name="initial-value" type="xsd:int"/> + <xsd:attribute name="allocation-size" type="xsd:int"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="table-generator"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME) + public @interface TableGenerator { + String name(); + String table() default ""; + String catalog() default ""; + String schema() default ""; + String pkColumnName() default ""; + String valueColumnName() default ""; + String pkColumnValue() default ""; + int initialValue() default 0; + int allocationSize() default 50; + UniqueConstraint[] uniqueConstraints() default {}; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="unique-constraint" type="orm:unique-constraint" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="table" type="xsd:string"/> + <xsd:attribute name="catalog" type="xsd:string"/> + <xsd:attribute name="schema" type="xsd:string"/> + <xsd:attribute name="pk-column-name" type="xsd:string"/> + <xsd:attribute name="value-column-name" type="xsd:string"/> + <xsd:attribute name="pk-column-value" type="xsd:string"/> + <xsd:attribute name="initial-value" type="xsd:int"/> + <xsd:attribute name="allocation-size" type="xsd:int"/> + </xsd:complexType> + +</xsd:schema> + + diff --git a/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/resources/orm_2_0.xsd b/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/resources/orm_2_0.xsd new file mode 100644 index 000000000..984d48691 --- /dev/null +++ b/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/resources/orm_2_0.xsd @@ -0,0 +1,1939 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Java Persistence API object/relational mapping file schema --> +<xsd:schema targetNamespace="http://java.sun.com/xml/ns/persistence/orm" + xmlns:orm="http://java.sun.com/xml/ns/persistence/orm" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + elementFormDefault="qualified" + attributeFormDefault="unqualified" + version="2.0"> + + <xsd:annotation> + <xsd:documentation> + @(#)orm_2_0.xsd 2.0 October 1 2009 + </xsd:documentation> + </xsd:annotation> + + <xsd:annotation> + <xsd:documentation> + + Copyright (c) 2008, 2009 Sun Microsystems. All rights reserved. + + This program and the accompanying materials are made available under the + terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0 + which accompanies this distribution. + The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html + and the Eclipse Distribution License is available at + http://www.eclipse.org/org/documents/edl-v10.php. + + Contributors: + Linda DeMichiel - Java Persistence 2.0, Version 2.0 (October 1, 2009) + Specification available from http://jcp.org/en/jsr/detail?id=317 + + </xsd:documentation> + </xsd:annotation> + + <xsd:annotation> + <xsd:documentation><![CDATA[ + + This is the XML Schema for the persistence object/relational + mapping file. + The file may be named "META-INF/orm.xml" in the persistence + archive or it may be named some other name which would be + used to locate the file as resource on the classpath. + + Object/relational mapping files must indicate the object/relational + mapping file schema by using the persistence namespace: + + http://java.sun.com/xml/ns/persistence + + and indicate the version of the schema by + using the version element as shown below: + + <entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm + http://java.sun.com/xml/ns/persistence/orm/orm_2_0.xsd" + version="2.0"> + ... + </entity-mappings> + + + ]]> + </xsd:documentation> + </xsd:annotation> + + <xsd:complexType name="emptyType"/> + + <xsd:simpleType name="versionType"> + <xsd:restriction base="xsd:token"> + <xsd:pattern value="[0-9]+(\.[0-9]+)*"/> + </xsd:restriction> + </xsd:simpleType> + + <!-- **************************************************** --> + + <xsd:element name="entity-mappings"> + <xsd:complexType> + <xsd:annotation> + <xsd:documentation> + + The entity-mappings element is the root element of a mapping + file. It contains the following four types of elements: + + 1. The persistence-unit-metadata element contains metadata + for the entire persistence unit. It is undefined if this element + occurs in multiple mapping files within the same persistence unit. + + 2. The package, schema, catalog and access elements apply to all of + the entity, mapped-superclass and embeddable elements defined in + the same file in which they occur. + + 3. The sequence-generator, table-generator, named-query, + named-native-query and sql-result-set-mapping elements are global + to the persistence unit. It is undefined to have more than one + sequence-generator or table-generator of the same name in the same + or different mapping files in a persistence unit. It is also + undefined to have more than one named-query, named-native-query, or + result-set-mapping of the same name in the same or different mapping + files in a persistence unit. + + 4. The entity, mapped-superclass and embeddable elements each define + the mapping information for a managed persistent class. The mapping + information contained in these elements may be complete or it may + be partial. + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" + minOccurs="0"/> + <xsd:element name="persistence-unit-metadata" + type="orm:persistence-unit-metadata" + minOccurs="0"/> + <xsd:element name="package" type="xsd:string" + minOccurs="0"/> + <xsd:element name="schema" type="xsd:string" + minOccurs="0"/> + <xsd:element name="catalog" type="xsd:string" + minOccurs="0"/> + <xsd:element name="access" type="orm:access-type" + minOccurs="0"/> + <xsd:element name="sequence-generator" type="orm:sequence-generator" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="table-generator" type="orm:table-generator" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="named-query" type="orm:named-query" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="named-native-query" type="orm:named-native-query" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="sql-result-set-mapping" + type="orm:sql-result-set-mapping" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="mapped-superclass" type="orm:mapped-superclass" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="entity" type="orm:entity" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="embeddable" type="orm:embeddable" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="version" type="orm:versionType" + fixed="2.0" use="required"/> + </xsd:complexType> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:complexType name="persistence-unit-metadata"> + <xsd:annotation> + <xsd:documentation> + + Metadata that applies to the persistence unit and not just to + the mapping file in which it is contained. + + If the xml-mapping-metadata-complete element is specified, + the complete set of mapping metadata for the persistence unit + is contained in the XML mapping files for the persistence unit. + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:element name="xml-mapping-metadata-complete" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="persistence-unit-defaults" + type="orm:persistence-unit-defaults" + minOccurs="0"/> + </xsd:sequence> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="persistence-unit-defaults"> + <xsd:annotation> + <xsd:documentation> + + These defaults are applied to the persistence unit as a whole + unless they are overridden by local annotation or XML + element settings. + + schema - Used as the schema for all tables, secondary tables, join + tables, collection tables, sequence generators, and table + generators that apply to the persistence unit + catalog - Used as the catalog for all tables, secondary tables, join + tables, collection tables, sequence generators, and table + generators that apply to the persistence unit + delimited-identifiers - Used to treat database identifiers as + delimited identifiers. + access - Used as the access type for all managed classes in + the persistence unit + cascade-persist - Adds cascade-persist to the set of cascade options + in all entity relationships of the persistence unit + entity-listeners - List of default entity listeners to be invoked + on each entity in the persistence unit. + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:element name="schema" type="xsd:string" + minOccurs="0"/> + <xsd:element name="catalog" type="xsd:string" + minOccurs="0"/> + <xsd:element name="delimited-identifiers" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="access" type="orm:access-type" + minOccurs="0"/> + <xsd:element name="cascade-persist" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="entity-listeners" type="orm:entity-listeners" + minOccurs="0"/> + </xsd:sequence> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="entity"> + <xsd:annotation> + <xsd:documentation> + + Defines the settings and mappings for an entity. Is allowed to be + sparsely populated and used in conjunction with the annotations. + Alternatively, the metadata-complete attribute can be used to + indicate that no annotations on the entity class (and its fields + or properties) are to be processed. If this is the case then + the defaulting rules for the entity and its subelements will + be recursively applied. + + @Target(TYPE) @Retention(RUNTIME) + public @interface Entity { + String name() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:element name="table" type="orm:table" + minOccurs="0"/> + <xsd:element name="secondary-table" type="orm:secondary-table" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="primary-key-join-column" + type="orm:primary-key-join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="id-class" type="orm:id-class" minOccurs="0"/> + <xsd:element name="inheritance" type="orm:inheritance" minOccurs="0"/> + <xsd:element name="discriminator-value" type="orm:discriminator-value" + minOccurs="0"/> + <xsd:element name="discriminator-column" + type="orm:discriminator-column" + minOccurs="0"/> + <xsd:element name="sequence-generator" type="orm:sequence-generator" + minOccurs="0"/> + <xsd:element name="table-generator" type="orm:table-generator" + minOccurs="0"/> + <xsd:element name="named-query" type="orm:named-query" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="named-native-query" type="orm:named-native-query" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="sql-result-set-mapping" + type="orm:sql-result-set-mapping" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="exclude-default-listeners" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="exclude-superclass-listeners" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="entity-listeners" type="orm:entity-listeners" + minOccurs="0"/> + <xsd:element name="pre-persist" type="orm:pre-persist" minOccurs="0"/> + <xsd:element name="post-persist" type="orm:post-persist" + minOccurs="0"/> + <xsd:element name="pre-remove" type="orm:pre-remove" minOccurs="0"/> + <xsd:element name="post-remove" type="orm:post-remove" minOccurs="0"/> + <xsd:element name="pre-update" type="orm:pre-update" minOccurs="0"/> + <xsd:element name="post-update" type="orm:post-update" minOccurs="0"/> + <xsd:element name="post-load" type="orm:post-load" minOccurs="0"/> + <xsd:element name="attribute-override" type="orm:attribute-override" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="association-override" + type="orm:association-override" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="attributes" type="orm:attributes" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="class" type="xsd:string" use="required"/> + <xsd:attribute name="access" type="orm:access-type"/> + <xsd:attribute name="cacheable" type="xsd:boolean"/> + <xsd:attribute name="metadata-complete" type="xsd:boolean"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:simpleType name="access-type"> + <xsd:annotation> + <xsd:documentation> + + This element determines how the persistence provider accesses the + state of an entity or embedded object. + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="PROPERTY"/> + <xsd:enumeration value="FIELD"/> + </xsd:restriction> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:complexType name="association-override"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME) + public @interface AssociationOverride { + String name(); + JoinColumn[] joinColumns() default{}; + JoinTable joinTable() default @JoinTable; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:choice> + <xsd:element name="join-column" type="orm:join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="join-table" type="orm:join-table" + minOccurs="0"/> + </xsd:choice> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="attribute-override"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME) + public @interface AttributeOverride { + String name(); + Column column(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:element name="column" type="orm:column"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="attributes"> + <xsd:annotation> + <xsd:documentation> + + This element contains the entity field or property mappings. + It may be sparsely populated to include only a subset of the + fields or properties. If metadata-complete for the entity is true + then the remainder of the attributes will be defaulted according + to the default rules. + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:choice> + <xsd:element name="id" type="orm:id" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="embedded-id" type="orm:embedded-id" + minOccurs="0"/> + </xsd:choice> + <xsd:element name="basic" type="orm:basic" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="version" type="orm:version" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="many-to-one" type="orm:many-to-one" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="one-to-many" type="orm:one-to-many" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="one-to-one" type="orm:one-to-one" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="many-to-many" type="orm:many-to-many" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="element-collection" type="orm:element-collection" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="embedded" type="orm:embedded" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="transient" type="orm:transient" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="basic"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Basic { + FetchType fetch() default EAGER; + boolean optional() default true; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="column" type="orm:column" minOccurs="0"/> + <xsd:choice> + <xsd:element name="lob" type="orm:lob" minOccurs="0"/> + <xsd:element name="temporal" type="orm:temporal" minOccurs="0"/> + <xsd:element name="enumerated" type="orm:enumerated" minOccurs="0"/> + </xsd:choice> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="fetch" type="orm:fetch-type"/> + <xsd:attribute name="optional" type="xsd:boolean"/> + <xsd:attribute name="access" type="orm:access-type"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="cascade-type"> + <xsd:annotation> + <xsd:documentation> + + public enum CascadeType { ALL, PERSIST, MERGE, REMOVE, REFRESH, DETACH}; + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="cascade-all" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="cascade-persist" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="cascade-merge" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="cascade-remove" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="cascade-refresh" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="cascade-detach" type="orm:emptyType" + minOccurs="0"/> + </xsd:sequence> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="collection-table"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface CollectionTable { + String name() default ""; + String catalog() default ""; + String schema() default ""; + JoinColumn[] joinColumns() default {}; + UniqueConstraint[] uniqueConstraints() default {}; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="join-column" type="orm:join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="unique-constraint" type="orm:unique-constraint" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="catalog" type="xsd:string"/> + <xsd:attribute name="schema" type="xsd:string"/> + </xsd:complexType> + + +<!-- **************************************************** --> + + <xsd:complexType name="column"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Column { + String name() default ""; + boolean unique() default false; + boolean nullable() default true; + boolean insertable() default true; + boolean updatable() default true; + String columnDefinition() default ""; + String table() default ""; + int length() default 255; + int precision() default 0; // decimal precision + int scale() default 0; // decimal scale + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="unique" type="xsd:boolean"/> + <xsd:attribute name="nullable" type="xsd:boolean"/> + <xsd:attribute name="insertable" type="xsd:boolean"/> + <xsd:attribute name="updatable" type="xsd:boolean"/> + <xsd:attribute name="column-definition" type="xsd:string"/> + <xsd:attribute name="table" type="xsd:string"/> + <xsd:attribute name="length" type="xsd:int"/> + <xsd:attribute name="precision" type="xsd:int"/> + <xsd:attribute name="scale" type="xsd:int"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="column-result"> + <xsd:annotation> + <xsd:documentation> + + @Target({}) @Retention(RUNTIME) + public @interface ColumnResult { + String name(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="discriminator-column"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface DiscriminatorColumn { + String name() default "DTYPE"; + DiscriminatorType discriminatorType() default STRING; + String columnDefinition() default ""; + int length() default 31; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="discriminator-type" type="orm:discriminator-type"/> + <xsd:attribute name="column-definition" type="xsd:string"/> + <xsd:attribute name="length" type="xsd:int"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:simpleType name="discriminator-type"> + <xsd:annotation> + <xsd:documentation> + + public enum DiscriminatorType { STRING, CHAR, INTEGER }; + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="STRING"/> + <xsd:enumeration value="CHAR"/> + <xsd:enumeration value="INTEGER"/> + </xsd:restriction> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:simpleType name="discriminator-value"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface DiscriminatorValue { + String value(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:string"/> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:complexType name="element-collection"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface ElementCollection { + Class targetClass() default void.class; + FetchType fetch() default LAZY; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:choice> + <xsd:element name="order-by" type="orm:order-by" + minOccurs="0"/> + <xsd:element name="order-column" type="orm:order-column" + minOccurs="0"/> + </xsd:choice> + <xsd:choice> + <xsd:element name="map-key" type="orm:map-key" + minOccurs="0"/> + <xsd:sequence> + <xsd:element name="map-key-class" type="orm:map-key-class" + minOccurs="0"/> + <xsd:choice> + <xsd:element name="map-key-temporal" + type="orm:temporal" + minOccurs="0"/> + <xsd:element name="map-key-enumerated" + type="orm:enumerated" + minOccurs="0"/> + <xsd:element name="map-key-attribute-override" + type="orm:attribute-override" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:choice> + <xsd:choice> + <xsd:element name="map-key-column" + type="orm:map-key-column" + minOccurs="0"/> + <xsd:element name="map-key-join-column" + type="orm:map-key-join-column" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:choice> + </xsd:sequence> + </xsd:choice> + <xsd:choice> + <xsd:sequence> + <xsd:element name="column" type="orm:column" minOccurs="0"/> + <xsd:choice> + <xsd:element name="temporal" + type="orm:temporal" + minOccurs="0"/> + <xsd:element name="enumerated" + type="orm:enumerated" + minOccurs="0"/> + <xsd:element name="lob" + type="orm:lob" + minOccurs="0"/> + </xsd:choice> + </xsd:sequence> + <xsd:sequence> + <xsd:element name="attribute-override" + type="orm:attribute-override" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="association-override" + type="orm:association-override" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:choice> + <xsd:element name="collection-table" type="orm:collection-table" + minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="target-class" type="xsd:string"/> + <xsd:attribute name="fetch" type="orm:fetch-type"/> + <xsd:attribute name="access" type="orm:access-type"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="embeddable"> + <xsd:annotation> + <xsd:documentation> + + Defines the settings and mappings for embeddable objects. Is + allowed to be sparsely populated and used in conjunction with + the annotations. Alternatively, the metadata-complete attribute + can be used to indicate that no annotations are to be processed + in the class. If this is the case then the defaulting rules will + be recursively applied. + + @Target({TYPE}) @Retention(RUNTIME) + public @interface Embeddable {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:element name="attributes" type="orm:embeddable-attributes" + minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="class" type="xsd:string" use="required"/> + <xsd:attribute name="access" type="orm:access-type"/> + <xsd:attribute name="metadata-complete" type="xsd:boolean"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="embeddable-attributes"> + <xsd:sequence> + <xsd:element name="basic" type="orm:basic" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="many-to-one" type="orm:many-to-one" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="one-to-many" type="orm:one-to-many" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="one-to-one" type="orm:one-to-one" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="many-to-many" type="orm:many-to-many" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="element-collection" type="orm:element-collection" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="embedded" type="orm:embedded" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="transient" type="orm:transient" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="embedded"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Embedded {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="attribute-override" type="orm:attribute-override" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="association-override" + type="orm:association-override" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="access" type="orm:access-type"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="embedded-id"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface EmbeddedId {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="attribute-override" type="orm:attribute-override" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="access" type="orm:access-type"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="entity-listener"> + <xsd:annotation> + <xsd:documentation> + + Defines an entity listener to be invoked at lifecycle events + for the entities that list this listener. + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:element name="pre-persist" type="orm:pre-persist" minOccurs="0"/> + <xsd:element name="post-persist" type="orm:post-persist" + minOccurs="0"/> + <xsd:element name="pre-remove" type="orm:pre-remove" minOccurs="0"/> + <xsd:element name="post-remove" type="orm:post-remove" minOccurs="0"/> + <xsd:element name="pre-update" type="orm:pre-update" minOccurs="0"/> + <xsd:element name="post-update" type="orm:post-update" minOccurs="0"/> + <xsd:element name="post-load" type="orm:post-load" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="class" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="entity-listeners"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface EntityListeners { + Class[] value(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="entity-listener" type="orm:entity-listener" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="entity-result"> + <xsd:annotation> + <xsd:documentation> + + @Target({}) @Retention(RUNTIME) + public @interface EntityResult { + Class entityClass(); + FieldResult[] fields() default {}; + String discriminatorColumn() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="field-result" type="orm:field-result" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="entity-class" type="xsd:string" use="required"/> + <xsd:attribute name="discriminator-column" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:simpleType name="enum-type"> + <xsd:annotation> + <xsd:documentation> + + public enum EnumType { + ORDINAL, + STRING + } + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="ORDINAL"/> + <xsd:enumeration value="STRING"/> + </xsd:restriction> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:simpleType name="enumerated"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Enumerated { + EnumType value() default ORDINAL; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="orm:enum-type"/> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:simpleType name="fetch-type"> + <xsd:annotation> + <xsd:documentation> + + public enum FetchType { LAZY, EAGER }; + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="LAZY"/> + <xsd:enumeration value="EAGER"/> + </xsd:restriction> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:complexType name="field-result"> + <xsd:annotation> + <xsd:documentation> + + @Target({}) @Retention(RUNTIME) + public @interface FieldResult { + String name(); + String column(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="column" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="generated-value"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface GeneratedValue { + GenerationType strategy() default AUTO; + String generator() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="strategy" type="orm:generation-type"/> + <xsd:attribute name="generator" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:simpleType name="generation-type"> + <xsd:annotation> + <xsd:documentation> + + public enum GenerationType { TABLE, SEQUENCE, IDENTITY, AUTO }; + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="TABLE"/> + <xsd:enumeration value="SEQUENCE"/> + <xsd:enumeration value="IDENTITY"/> + <xsd:enumeration value="AUTO"/> + </xsd:restriction> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:complexType name="id"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Id {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="column" type="orm:column" + minOccurs="0"/> + <xsd:element name="generated-value" type="orm:generated-value" + minOccurs="0"/> + <xsd:element name="temporal" type="orm:temporal" + minOccurs="0"/> + <xsd:element name="table-generator" type="orm:table-generator" + minOccurs="0"/> + <xsd:element name="sequence-generator" type="orm:sequence-generator" + minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="access" type="orm:access-type"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="id-class"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface IdClass { + Class value(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="class" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="inheritance"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface Inheritance { + InheritanceType strategy() default SINGLE_TABLE; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="strategy" type="orm:inheritance-type"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:simpleType name="inheritance-type"> + <xsd:annotation> + <xsd:documentation> + + public enum InheritanceType + { SINGLE_TABLE, JOINED, TABLE_PER_CLASS}; + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="SINGLE_TABLE"/> + <xsd:enumeration value="JOINED"/> + <xsd:enumeration value="TABLE_PER_CLASS"/> + </xsd:restriction> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:complexType name="join-column"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface JoinColumn { + String name() default ""; + String referencedColumnName() default ""; + boolean unique() default false; + boolean nullable() default true; + boolean insertable() default true; + boolean updatable() default true; + String columnDefinition() default ""; + String table() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="referenced-column-name" type="xsd:string"/> + <xsd:attribute name="unique" type="xsd:boolean"/> + <xsd:attribute name="nullable" type="xsd:boolean"/> + <xsd:attribute name="insertable" type="xsd:boolean"/> + <xsd:attribute name="updatable" type="xsd:boolean"/> + <xsd:attribute name="column-definition" type="xsd:string"/> + <xsd:attribute name="table" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="join-table"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface JoinTable { + String name() default ""; + String catalog() default ""; + String schema() default ""; + JoinColumn[] joinColumns() default {}; + JoinColumn[] inverseJoinColumns() default {}; + UniqueConstraint[] uniqueConstraints() default {}; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="join-column" type="orm:join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="inverse-join-column" type="orm:join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="unique-constraint" type="orm:unique-constraint" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="catalog" type="xsd:string"/> + <xsd:attribute name="schema" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="lob"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Lob {} + + </xsd:documentation> + </xsd:annotation> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:simpleType name="lock-mode-type"> + <xsd:annotation> + <xsd:documentation> + + public enum LockModeType { READ, WRITE, OPTIMISTIC, OPTIMISTIC_FORCE_INCREMENT, PESSIMISTIC_READ, PESSIMISTIC_WRITE, PESSIMISTIC_FORCE_INCREMENT, NONE}; + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="READ"/> + <xsd:enumeration value="WRITE"/> + <xsd:enumeration value="OPTIMISTIC"/> + <xsd:enumeration value="OPTIMISTIC_FORCE_INCREMENT"/> + <xsd:enumeration value="PESSIMISTIC_READ"/> + <xsd:enumeration value="PESSIMISTIC_WRITE"/> + <xsd:enumeration value="PESSIMISTIC_FORCE_INCREMENT"/> + <xsd:enumeration value="NONE"/> + + </xsd:restriction> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:complexType name="many-to-many"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface ManyToMany { + Class targetEntity() default void.class; + CascadeType[] cascade() default {}; + FetchType fetch() default LAZY; + String mappedBy() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:choice> + <xsd:element name="order-by" type="orm:order-by" + minOccurs="0"/> + <xsd:element name="order-column" type="orm:order-column" + minOccurs="0"/> + </xsd:choice> + <xsd:choice> + <xsd:element name="map-key" type="orm:map-key" + minOccurs="0"/> + <xsd:sequence> + <xsd:element name="map-key-class" type="orm:map-key-class" + minOccurs="0"/> + <xsd:choice> + <xsd:element name="map-key-temporal" + type="orm:temporal" + minOccurs="0"/> + <xsd:element name="map-key-enumerated" + type="orm:enumerated" + minOccurs="0"/> + <xsd:element name="map-key-attribute-override" + type="orm:attribute-override" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:choice> + <xsd:choice> + <xsd:element name="map-key-column" type="orm:map-key-column" + minOccurs="0"/> + <xsd:element name="map-key-join-column" + type="orm:map-key-join-column" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:choice> + </xsd:sequence> + </xsd:choice> + <xsd:element name="join-table" type="orm:join-table" + minOccurs="0"/> + <xsd:element name="cascade" type="orm:cascade-type" + minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="target-entity" type="xsd:string"/> + <xsd:attribute name="fetch" type="orm:fetch-type"/> + <xsd:attribute name="access" type="orm:access-type"/> + <xsd:attribute name="mapped-by" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="many-to-one"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface ManyToOne { + Class targetEntity() default void.class; + CascadeType[] cascade() default {}; + FetchType fetch() default EAGER; + boolean optional() default true; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:choice> + <xsd:element name="join-column" type="orm:join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="join-table" type="orm:join-table" + minOccurs="0"/> + </xsd:choice> + <xsd:element name="cascade" type="orm:cascade-type" + minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="target-entity" type="xsd:string"/> + <xsd:attribute name="fetch" type="orm:fetch-type"/> + <xsd:attribute name="optional" type="xsd:boolean"/> + <xsd:attribute name="access" type="orm:access-type"/> + <xsd:attribute name="maps-id" type="xsd:string"/> + <xsd:attribute name="id" type="xsd:boolean"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="map-key"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface MapKey { + String name() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="map-key-class"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface MapKeyClass { + Class value(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="class" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="map-key-column"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface MapKeyColumn { + String name() default ""; + boolean unique() default false; + boolean nullable() default false; + boolean insertable() default true; + boolean updatable() default true; + String columnDefinition() default ""; + String table() default ""; + int length() default 255; + int precision() default 0; // decimal precision + int scale() default 0; // decimal scale + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="unique" type="xsd:boolean"/> + <xsd:attribute name="nullable" type="xsd:boolean"/> + <xsd:attribute name="insertable" type="xsd:boolean"/> + <xsd:attribute name="updatable" type="xsd:boolean"/> + <xsd:attribute name="column-definition" type="xsd:string"/> + <xsd:attribute name="table" type="xsd:string"/> + <xsd:attribute name="length" type="xsd:int"/> + <xsd:attribute name="precision" type="xsd:int"/> + <xsd:attribute name="scale" type="xsd:int"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="map-key-join-column"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface MapKeyJoinColumn { + String name() default ""; + String referencedColumnName() default ""; + boolean unique() default false; + boolean nullable() default false; + boolean insertable() default true; + boolean updatable() default true; + String columnDefinition() default ""; + String table() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="referenced-column-name" type="xsd:string"/> + <xsd:attribute name="unique" type="xsd:boolean"/> + <xsd:attribute name="nullable" type="xsd:boolean"/> + <xsd:attribute name="insertable" type="xsd:boolean"/> + <xsd:attribute name="updatable" type="xsd:boolean"/> + <xsd:attribute name="column-definition" type="xsd:string"/> + <xsd:attribute name="table" type="xsd:string"/> + </xsd:complexType> + + +<!-- **************************************************** --> + + <xsd:complexType name="mapped-superclass"> + <xsd:annotation> + <xsd:documentation> + + Defines the settings and mappings for a mapped superclass. Is + allowed to be sparsely populated and used in conjunction with + the annotations. Alternatively, the metadata-complete attribute + can be used to indicate that no annotations are to be processed + If this is the case then the defaulting rules will be recursively + applied. + + @Target(TYPE) @Retention(RUNTIME) + public @interface MappedSuperclass{} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:element name="id-class" type="orm:id-class" minOccurs="0"/> + <xsd:element name="exclude-default-listeners" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="exclude-superclass-listeners" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="entity-listeners" type="orm:entity-listeners" + minOccurs="0"/> + <xsd:element name="pre-persist" type="orm:pre-persist" minOccurs="0"/> + <xsd:element name="post-persist" type="orm:post-persist" + minOccurs="0"/> + <xsd:element name="pre-remove" type="orm:pre-remove" minOccurs="0"/> + <xsd:element name="post-remove" type="orm:post-remove" minOccurs="0"/> + <xsd:element name="pre-update" type="orm:pre-update" minOccurs="0"/> + <xsd:element name="post-update" type="orm:post-update" minOccurs="0"/> + <xsd:element name="post-load" type="orm:post-load" minOccurs="0"/> + <xsd:element name="attributes" type="orm:attributes" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="class" type="xsd:string" use="required"/> + <xsd:attribute name="access" type="orm:access-type"/> + <xsd:attribute name="metadata-complete" type="xsd:boolean"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="named-native-query"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface NamedNativeQuery { + String name(); + String query(); + QueryHint[] hints() default {}; + Class resultClass() default void.class; + String resultSetMapping() default ""; //named SqlResultSetMapping + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:element name="query" type="xsd:string"/> + <xsd:element name="hint" type="orm:query-hint" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="result-class" type="xsd:string"/> + <xsd:attribute name="result-set-mapping" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="named-query"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface NamedQuery { + String name(); + String query(); + LockModeType lockMode() default NONE; + QueryHint[] hints() default {}; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:element name="query" type="xsd:string"/> + <xsd:element name="lock-mode" type="orm:lock-mode-type" minOccurs="0"/> + <xsd:element name="hint" type="orm:query-hint" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="one-to-many"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface OneToMany { + Class targetEntity() default void.class; + CascadeType[] cascade() default {}; + FetchType fetch() default LAZY; + String mappedBy() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:choice> + <xsd:element name="order-by" type="orm:order-by" + minOccurs="0"/> + <xsd:element name="order-column" type="orm:order-column" + minOccurs="0"/> + </xsd:choice> + <xsd:choice> + <xsd:element name="map-key" type="orm:map-key" + minOccurs="0"/> + <xsd:sequence> + <xsd:element name="map-key-class" type="orm:map-key-class" + minOccurs="0"/> + <xsd:choice> + <xsd:element name="map-key-temporal" + type="orm:temporal" + minOccurs="0"/> + <xsd:element name="map-key-enumerated" + type="orm:enumerated" + minOccurs="0"/> + <xsd:element name="map-key-attribute-override" + type="orm:attribute-override" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:choice> + <xsd:choice> + <xsd:element name="map-key-column" type="orm:map-key-column" + minOccurs="0"/> + <xsd:element name="map-key-join-column" + type="orm:map-key-join-column" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:choice> + </xsd:sequence> + </xsd:choice> + <xsd:choice> + <xsd:element name="join-table" type="orm:join-table" + minOccurs="0"/> + <xsd:element name="join-column" type="orm:join-column" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:choice> + <xsd:element name="cascade" type="orm:cascade-type" + minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="target-entity" type="xsd:string"/> + <xsd:attribute name="fetch" type="orm:fetch-type"/> + <xsd:attribute name="access" type="orm:access-type"/> + <xsd:attribute name="mapped-by" type="xsd:string"/> + <xsd:attribute name="orphan-removal" type="xsd:boolean"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="one-to-one"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface OneToOne { + Class targetEntity() default void.class; + CascadeType[] cascade() default {}; + FetchType fetch() default EAGER; + boolean optional() default true; + String mappedBy() default ""; + boolean orphanRemoval() default false; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:choice> + <xsd:element name="primary-key-join-column" + type="orm:primary-key-join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="join-column" type="orm:join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="join-table" type="orm:join-table" + minOccurs="0"/> + </xsd:choice> + <xsd:element name="cascade" type="orm:cascade-type" + minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="target-entity" type="xsd:string"/> + <xsd:attribute name="fetch" type="orm:fetch-type"/> + <xsd:attribute name="optional" type="xsd:boolean"/> + <xsd:attribute name="access" type="orm:access-type"/> + <xsd:attribute name="mapped-by" type="xsd:string"/> + <xsd:attribute name="orphan-removal" type="xsd:boolean"/> + <xsd:attribute name="maps-id" type="xsd:string"/> + <xsd:attribute name="id" type="xsd:boolean"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:simpleType name="order-by"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface OrderBy { + String value() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:string"/> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:complexType name="order-column"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface OrderColumn { + String name() default ""; + boolean nullable() default true; + boolean insertable() default true; + boolean updatable() default true; + String columnDefinition() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="nullable" type="xsd:boolean"/> + <xsd:attribute name="insertable" type="xsd:boolean"/> + <xsd:attribute name="updatable" type="xsd:boolean"/> + <xsd:attribute name="column-definition" type="xsd:string"/> + </xsd:complexType> + + +<!-- **************************************************** --> + + <xsd:complexType name="post-load"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PostLoad {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="method-name" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="post-persist"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PostPersist {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="method-name" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="post-remove"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PostRemove {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="method-name" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="post-update"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PostUpdate {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="method-name" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="pre-persist"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PrePersist {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="method-name" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="pre-remove"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PreRemove {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="method-name" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="pre-update"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PreUpdate {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="method-name" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="primary-key-join-column"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME) + public @interface PrimaryKeyJoinColumn { + String name() default ""; + String referencedColumnName() default ""; + String columnDefinition() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="referenced-column-name" type="xsd:string"/> + <xsd:attribute name="column-definition" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="query-hint"> + <xsd:annotation> + <xsd:documentation> + + @Target({}) @Retention(RUNTIME) + public @interface QueryHint { + String name(); + String value(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="value" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="secondary-table"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface SecondaryTable { + String name(); + String catalog() default ""; + String schema() default ""; + PrimaryKeyJoinColumn[] pkJoinColumns() default {}; + UniqueConstraint[] uniqueConstraints() default {}; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="primary-key-join-column" + type="orm:primary-key-join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="unique-constraint" type="orm:unique-constraint" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="catalog" type="xsd:string"/> + <xsd:attribute name="schema" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="sequence-generator"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME) + public @interface SequenceGenerator { + String name(); + String sequenceName() default ""; + String catalog() default ""; + String schema() default ""; + int initialValue() default 1; + int allocationSize() default 50; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="sequence-name" type="xsd:string"/> + <xsd:attribute name="catalog" type="xsd:string"/> + <xsd:attribute name="schema" type="xsd:string"/> + <xsd:attribute name="initial-value" type="xsd:int"/> + <xsd:attribute name="allocation-size" type="xsd:int"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="sql-result-set-mapping"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface SqlResultSetMapping { + String name(); + EntityResult[] entities() default {}; + ColumnResult[] columns() default {}; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:element name="entity-result" type="orm:entity-result" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="column-result" type="orm:column-result" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="table"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface Table { + String name() default ""; + String catalog() default ""; + String schema() default ""; + UniqueConstraint[] uniqueConstraints() default {}; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="unique-constraint" type="orm:unique-constraint" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="catalog" type="xsd:string"/> + <xsd:attribute name="schema" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="table-generator"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME) + public @interface TableGenerator { + String name(); + String table() default ""; + String catalog() default ""; + String schema() default ""; + String pkColumnName() default ""; + String valueColumnName() default ""; + String pkColumnValue() default ""; + int initialValue() default 0; + int allocationSize() default 50; + UniqueConstraint[] uniqueConstraints() default {}; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:element name="unique-constraint" type="orm:unique-constraint" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="table" type="xsd:string"/> + <xsd:attribute name="catalog" type="xsd:string"/> + <xsd:attribute name="schema" type="xsd:string"/> + <xsd:attribute name="pk-column-name" type="xsd:string"/> + <xsd:attribute name="value-column-name" type="xsd:string"/> + <xsd:attribute name="pk-column-value" type="xsd:string"/> + <xsd:attribute name="initial-value" type="xsd:int"/> + <xsd:attribute name="allocation-size" type="xsd:int"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:simpleType name="temporal"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Temporal { + TemporalType value(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="orm:temporal-type"/> + </xsd:simpleType> + + <!-- **************************************************** --> + + <xsd:simpleType name="temporal-type"> + <xsd:annotation> + <xsd:documentation> + + public enum TemporalType { + DATE, // java.sql.Date + TIME, // java.sql.Time + TIMESTAMP // java.sql.Timestamp + } + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="DATE"/> + <xsd:enumeration value="TIME"/> + <xsd:enumeration value="TIMESTAMP"/> + </xsd:restriction> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:complexType name="transient"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Transient {} + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="unique-constraint"> + <xsd:annotation> + <xsd:documentation> + + @Target({}) @Retention(RUNTIME) + public @interface UniqueConstraint { + String name() default ""; + String[] columnNames(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="column-name" type="xsd:string" + maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="version"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Version {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="column" type="orm:column" minOccurs="0"/> + <xsd:element name="temporal" type="orm:temporal" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="access" type="orm:access-type"/> + </xsd:complexType> + +</xsd:schema> diff --git a/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/resources/orm_2_1.xsd b/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/resources/orm_2_1.xsd new file mode 100644 index 000000000..6aa624891 --- /dev/null +++ b/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/resources/orm_2_1.xsd @@ -0,0 +1,2336 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Java Persistence API object/relational mapping file schema --> +<xsd:schema targetNamespace="http://xmlns.jcp.org/xml/ns/persistence/orm" + xmlns:orm="http://xmlns.jcp.org/xml/ns/persistence/orm" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + elementFormDefault="qualified" + attributeFormDefault="unqualified" + version="2.1"> + + <xsd:annotation> + <xsd:documentation> + @(#)orm_2_1.xsd 2.1 February 15 2013 + </xsd:documentation> + </xsd:annotation> + + <xsd:annotation> + <xsd:documentation> + + Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved. + + This program and the accompanying materials are made available under the + terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0 + which accompanies this distribution. + The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html + and the Eclipse Distribution License is available at + http://www.eclipse.org/org/documents/edl-v10.php. + + Contributors: + Linda DeMichiel - Java Persistence 2.1, Version 2.1 (February 15, 2013) + Specification available from http://jcp.org/en/jsr/detail?id=338 + + </xsd:documentation> + </xsd:annotation> + + <xsd:annotation> + <xsd:documentation><![CDATA[ + + This is the XML Schema for the persistence object/relational + mapping file. + The file may be named "META-INF/orm.xml" in the persistence + archive or it may be named some other name which would be + used to locate the file as resource on the classpath. + + Object/relational mapping files must indicate the object/relational + mapping file schema by using the persistence namespace: + + http://xmlns.jcp.org/xml/ns/persistence/orm + + and indicate the version of the schema by + using the version element as shown below: + + <entity-mappings xmlns="http://xmlns.jcp.org/xml/ns/persistence/orm" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence/orm + http://xmlns.jcp.org/xml/ns/persistence/orm_2_1.xsd" + version="2.1"> + ... + </entity-mappings> + + + ]]></xsd:documentation> + </xsd:annotation> + + <xsd:complexType name="emptyType"/> + + <xsd:simpleType name="versionType"> + <xsd:restriction base="xsd:token"> + <xsd:pattern value="[0-9]+(\.[0-9]+)*"/> + </xsd:restriction> + </xsd:simpleType> + + <!-- **************************************************** --> + + <xsd:element name="entity-mappings"> + <xsd:complexType> + <xsd:annotation> + <xsd:documentation> + + The entity-mappings element is the root element of a mapping + file. It contains the following four types of elements: + + 1. The persistence-unit-metadata element contains metadata + for the entire persistence unit. It is undefined if this element + occurs in multiple mapping files within the same persistence unit. + + 2. The package, schema, catalog and access elements apply to all of + the entity, mapped-superclass and embeddable elements defined in + the same file in which they occur. + + 3. The sequence-generator, table-generator, converter, named-query, + named-native-query, named-stored-procedure-query, and + sql-result-set-mapping elements are global to the persistence + unit. It is undefined to have more than one sequence-generator + or table-generator of the same name in the same or different + mapping files in a persistence unit. It is undefined to have + more than one named-query, named-native-query, sql-result-set-mapping, + or named-stored-procedure-query of the same name in the same + or different mapping files in a persistence unit. It is also + undefined to have more than one converter for the same target + type in the same or different mapping files in a persistence unit. + + 4. The entity, mapped-superclass and embeddable elements each define + the mapping information for a managed persistent class. The mapping + information contained in these elements may be complete or it may + be partial. + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" + minOccurs="0"/> + <xsd:element name="persistence-unit-metadata" + type="orm:persistence-unit-metadata" + minOccurs="0"/> + <xsd:element name="package" type="xsd:string" + minOccurs="0"/> + <xsd:element name="schema" type="xsd:string" + minOccurs="0"/> + <xsd:element name="catalog" type="xsd:string" + minOccurs="0"/> + <xsd:element name="access" type="orm:access-type" + minOccurs="0"/> + <xsd:element name="sequence-generator" type="orm:sequence-generator" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="table-generator" type="orm:table-generator" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="named-query" type="orm:named-query" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="named-native-query" type="orm:named-native-query" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="named-stored-procedure-query" + type="orm:named-stored-procedure-query" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="sql-result-set-mapping" + type="orm:sql-result-set-mapping" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="mapped-superclass" type="orm:mapped-superclass" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="entity" type="orm:entity" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="embeddable" type="orm:embeddable" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="converter" type="orm:converter" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="version" type="orm:versionType" + fixed="2.1" use="required"/> + </xsd:complexType> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:complexType name="persistence-unit-metadata"> + <xsd:annotation> + <xsd:documentation> + + Metadata that applies to the persistence unit and not just to + the mapping file in which it is contained. + + If the xml-mapping-metadata-complete element is specified, + the complete set of mapping metadata for the persistence unit + is contained in the XML mapping files for the persistence unit. + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:element name="xml-mapping-metadata-complete" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="persistence-unit-defaults" + type="orm:persistence-unit-defaults" + minOccurs="0"/> + </xsd:sequence> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="persistence-unit-defaults"> + <xsd:annotation> + <xsd:documentation> + + These defaults are applied to the persistence unit as a whole + unless they are overridden by local annotation or XML + element settings. + + schema - Used as the schema for all tables, secondary tables, join + tables, collection tables, sequence generators, and table + generators that apply to the persistence unit + catalog - Used as the catalog for all tables, secondary tables, join + tables, collection tables, sequence generators, and table + generators that apply to the persistence unit + delimited-identifiers - Used to treat database identifiers as + delimited identifiers. + access - Used as the access type for all managed classes in + the persistence unit + cascade-persist - Adds cascade-persist to the set of cascade options + in all entity relationships of the persistence unit + entity-listeners - List of default entity listeners to be invoked + on each entity in the persistence unit. + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:element name="schema" type="xsd:string" + minOccurs="0"/> + <xsd:element name="catalog" type="xsd:string" + minOccurs="0"/> + <xsd:element name="delimited-identifiers" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="access" type="orm:access-type" + minOccurs="0"/> + <xsd:element name="cascade-persist" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="entity-listeners" type="orm:entity-listeners" + minOccurs="0"/> + </xsd:sequence> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="entity"> + <xsd:annotation> + <xsd:documentation> + + Defines the settings and mappings for an entity. Is allowed to be + sparsely populated and used in conjunction with the annotations. + Alternatively, the metadata-complete attribute can be used to + indicate that no annotations on the entity class (and its fields + or properties) are to be processed. If this is the case then + the defaulting rules for the entity and its subelements will + be recursively applied. + + @Target(TYPE) @Retention(RUNTIME) + public @interface Entity { + String name() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:element name="table" type="orm:table" + minOccurs="0"/> + <xsd:element name="secondary-table" type="orm:secondary-table" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:sequence> + <xsd:element name="primary-key-join-column" + type="orm:primary-key-join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="primary-key-foreign-key" + type="orm:foreign-key" + minOccurs="0"/> + </xsd:sequence> + <xsd:element name="id-class" type="orm:id-class" minOccurs="0"/> + <xsd:element name="inheritance" type="orm:inheritance" minOccurs="0"/> + <xsd:element name="discriminator-value" type="orm:discriminator-value" + minOccurs="0"/> + <xsd:element name="discriminator-column" + type="orm:discriminator-column" + minOccurs="0"/> + <xsd:element name="sequence-generator" type="orm:sequence-generator" + minOccurs="0"/> + <xsd:element name="table-generator" type="orm:table-generator" + minOccurs="0"/> + <xsd:element name="named-query" type="orm:named-query" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="named-native-query" type="orm:named-native-query" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="named-stored-procedure-query" + type="orm:named-stored-procedure-query" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="sql-result-set-mapping" + type="orm:sql-result-set-mapping" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="exclude-default-listeners" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="exclude-superclass-listeners" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="entity-listeners" type="orm:entity-listeners" + minOccurs="0"/> + <xsd:element name="pre-persist" type="orm:pre-persist" minOccurs="0"/> + <xsd:element name="post-persist" type="orm:post-persist" + minOccurs="0"/> + <xsd:element name="pre-remove" type="orm:pre-remove" minOccurs="0"/> + <xsd:element name="post-remove" type="orm:post-remove" minOccurs="0"/> + <xsd:element name="pre-update" type="orm:pre-update" minOccurs="0"/> + <xsd:element name="post-update" type="orm:post-update" minOccurs="0"/> + <xsd:element name="post-load" type="orm:post-load" minOccurs="0"/> + <xsd:element name="attribute-override" type="orm:attribute-override" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="association-override" + type="orm:association-override" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="convert" type="orm:convert" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="named-entity-graph" type="orm:named-entity-graph" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="attributes" type="orm:attributes" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="class" type="xsd:string" use="required"/> + <xsd:attribute name="access" type="orm:access-type"/> + <xsd:attribute name="cacheable" type="xsd:boolean"/> + <xsd:attribute name="metadata-complete" type="xsd:boolean"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:simpleType name="access-type"> + <xsd:annotation> + <xsd:documentation> + + This element determines how the persistence provider accesses the + state of an entity or embedded object. + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="PROPERTY"/> + <xsd:enumeration value="FIELD"/> + </xsd:restriction> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:complexType name="association-override"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME) + public @interface AssociationOverride { + String name(); + JoinColumn[] joinColumns() default{}; + JoinTable joinTable() default @JoinTable; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:choice> + <xsd:sequence> + <xsd:element name="join-column" type="orm:join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="foreign-key" type="orm:foreign-key" + minOccurs="0"/> + </xsd:sequence> + <xsd:element name="join-table" type="orm:join-table" + minOccurs="0"/> + </xsd:choice> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="attribute-override"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME) + public @interface AttributeOverride { + String name(); + Column column(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:element name="column" type="orm:column"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="attributes"> + <xsd:annotation> + <xsd:documentation> + + This element contains the entity field or property mappings. + It may be sparsely populated to include only a subset of the + fields or properties. If metadata-complete for the entity is true + then the remainder of the attributes will be defaulted according + to the default rules. + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:choice> + <xsd:element name="id" type="orm:id" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="embedded-id" type="orm:embedded-id" + minOccurs="0"/> + </xsd:choice> + <xsd:element name="basic" type="orm:basic" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="version" type="orm:version" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="many-to-one" type="orm:many-to-one" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="one-to-many" type="orm:one-to-many" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="one-to-one" type="orm:one-to-one" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="many-to-many" type="orm:many-to-many" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="element-collection" type="orm:element-collection" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="embedded" type="orm:embedded" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="transient" type="orm:transient" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="basic"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Basic { + FetchType fetch() default EAGER; + boolean optional() default true; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="column" type="orm:column" minOccurs="0"/> + <xsd:choice> + <xsd:element name="lob" type="orm:lob" minOccurs="0"/> + <xsd:element name="temporal" type="orm:temporal" minOccurs="0"/> + <xsd:element name="enumerated" type="orm:enumerated" minOccurs="0"/> + <xsd:element name="convert" type="orm:convert" minOccurs="0"/> + </xsd:choice> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="fetch" type="orm:fetch-type"/> + <xsd:attribute name="optional" type="xsd:boolean"/> + <xsd:attribute name="access" type="orm:access-type"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="cascade-type"> + <xsd:annotation> + <xsd:documentation> + + public enum CascadeType { ALL, PERSIST, MERGE, REMOVE, REFRESH, DETACH}; + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="cascade-all" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="cascade-persist" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="cascade-merge" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="cascade-remove" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="cascade-refresh" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="cascade-detach" type="orm:emptyType" + minOccurs="0"/> + </xsd:sequence> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="collection-table"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface CollectionTable { + String name() default ""; + String catalog() default ""; + String schema() default ""; + JoinColumn[] joinColumns() default {}; + UniqueConstraint[] uniqueConstraints() default {}; + Index[] indexes() default {}; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:sequence> + <xsd:element name="join-column" type="orm:join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="foreign-key" type="orm:foreign-key" + minOccurs="0"/> + </xsd:sequence> + <xsd:element name="unique-constraint" type="orm:unique-constraint" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="index" type="orm:index" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="catalog" type="xsd:string"/> + <xsd:attribute name="schema" type="xsd:string"/> + </xsd:complexType> + + +<!-- **************************************************** --> + + <xsd:complexType name="column"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Column { + String name() default ""; + boolean unique() default false; + boolean nullable() default true; + boolean insertable() default true; + boolean updatable() default true; + String columnDefinition() default ""; + String table() default ""; + int length() default 255; + int precision() default 0; // decimal precision + int scale() default 0; // decimal scale + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="unique" type="xsd:boolean"/> + <xsd:attribute name="nullable" type="xsd:boolean"/> + <xsd:attribute name="insertable" type="xsd:boolean"/> + <xsd:attribute name="updatable" type="xsd:boolean"/> + <xsd:attribute name="column-definition" type="xsd:string"/> + <xsd:attribute name="table" type="xsd:string"/> + <xsd:attribute name="length" type="xsd:int"/> + <xsd:attribute name="precision" type="xsd:int"/> + <xsd:attribute name="scale" type="xsd:int"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="column-result"> + <xsd:annotation> + <xsd:documentation> + + @Target({}) @Retention(RUNTIME) + public @interface ColumnResult { + String name(); + Class type() default void.class; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="class" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:simpleType name="constraint-mode"> + <xsd:annotation> + <xsd:documentation> + + public enum ConstraintMode {CONSTRAINT, NO_CONSTRAINT, PROVIDER_DEFAULT}; + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="CONSTRAINT"/> + <xsd:enumeration value="NO_CONSTRAINT"/> + <xsd:enumeration value="PROVIDER_DEFAULT"/> + </xsd:restriction> + </xsd:simpleType> + +<!-- **************************************************** --> + + + <xsd:complexType name="constructor-result"> + <xsd:annotation> + <xsd:documentation> + + @Target({}) @Retention(RUNTIME) + public @interface ConstructorResult { + Class targetClass(); + ColumnResult[] columns(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="column" type="orm:column-result" + maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="target-class" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="convert"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME) + public @interface Convert { + Class converter() default void.class; + String attributeName() default ""; + boolean disableConversion() default false; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="converter" type="xsd:string"/> + <xsd:attribute name="attribute-name" type="xsd:string"/> + <xsd:attribute name="disable-conversion" type="xsd:boolean"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="converter"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME) + public @interface Converter { + boolean autoApply() default false; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="class" type="xsd:string" use="required"/> + <xsd:attribute name="auto-apply" type="xsd:boolean"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="discriminator-column"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface DiscriminatorColumn { + String name() default "DTYPE"; + DiscriminatorType discriminatorType() default STRING; + String columnDefinition() default ""; + int length() default 31; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="discriminator-type" type="orm:discriminator-type"/> + <xsd:attribute name="column-definition" type="xsd:string"/> + <xsd:attribute name="length" type="xsd:int"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:simpleType name="discriminator-type"> + <xsd:annotation> + <xsd:documentation> + + public enum DiscriminatorType { STRING, CHAR, INTEGER }; + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="STRING"/> + <xsd:enumeration value="CHAR"/> + <xsd:enumeration value="INTEGER"/> + </xsd:restriction> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:simpleType name="discriminator-value"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface DiscriminatorValue { + String value(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:string"/> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:complexType name="element-collection"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface ElementCollection { + Class targetClass() default void.class; + FetchType fetch() default LAZY; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:choice> + <xsd:element name="order-by" type="orm:order-by" + minOccurs="0"/> + <xsd:element name="order-column" type="orm:order-column" + minOccurs="0"/> + </xsd:choice> + <xsd:choice> + <xsd:element name="map-key" type="orm:map-key" + minOccurs="0"/> + <xsd:sequence> + <xsd:element name="map-key-class" type="orm:map-key-class" + minOccurs="0"/> + <xsd:choice> + <xsd:element name="map-key-temporal" + type="orm:temporal" + minOccurs="0"/> + <xsd:element name="map-key-enumerated" + type="orm:enumerated" + minOccurs="0"/> + <xsd:sequence> + <xsd:element name="map-key-attribute-override" + type="orm:attribute-override" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="map-key-convert" type="orm:convert" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:choice> + <xsd:choice> + <xsd:element name="map-key-column" + type="orm:map-key-column" + minOccurs="0"/> + <xsd:sequence> + <xsd:element name="map-key-join-column" + type="orm:map-key-join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="map-key-foreign-key" + type="orm:foreign-key" + minOccurs="0"/> + </xsd:sequence> + </xsd:choice> + </xsd:sequence> + </xsd:choice> + <xsd:choice> + <xsd:sequence> + <xsd:element name="column" type="orm:column" minOccurs="0"/> + <xsd:choice> + <xsd:element name="temporal" + type="orm:temporal" + minOccurs="0"/> + <xsd:element name="enumerated" + type="orm:enumerated" + minOccurs="0"/> + <xsd:element name="lob" + type="orm:lob" + minOccurs="0"/> + </xsd:choice> + </xsd:sequence> + <xsd:sequence> + <xsd:element name="attribute-override" + type="orm:attribute-override" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="association-override" + type="orm:association-override" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="convert" type="orm:convert" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:choice> + <xsd:element name="collection-table" type="orm:collection-table" + minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="target-class" type="xsd:string"/> + <xsd:attribute name="fetch" type="orm:fetch-type"/> + <xsd:attribute name="access" type="orm:access-type"/> +</xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="embeddable"> + <xsd:annotation> + <xsd:documentation> + + Defines the settings and mappings for embeddable objects. Is + allowed to be sparsely populated and used in conjunction with + the annotations. Alternatively, the metadata-complete attribute + can be used to indicate that no annotations are to be processed + in the class. If this is the case then the defaulting rules will + be recursively applied. + + @Target({TYPE}) @Retention(RUNTIME) + public @interface Embeddable {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:element name="attributes" type="orm:embeddable-attributes" + minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="class" type="xsd:string" use="required"/> + <xsd:attribute name="access" type="orm:access-type"/> + <xsd:attribute name="metadata-complete" type="xsd:boolean"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="embeddable-attributes"> + <xsd:sequence> + <xsd:element name="basic" type="orm:basic" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="many-to-one" type="orm:many-to-one" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="one-to-many" type="orm:one-to-many" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="one-to-one" type="orm:one-to-one" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="many-to-many" type="orm:many-to-many" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="element-collection" type="orm:element-collection" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="embedded" type="orm:embedded" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="transient" type="orm:transient" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:complexType name="embedded"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Embedded {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="attribute-override" type="orm:attribute-override" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="association-override" + type="orm:association-override" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="convert" type="orm:convert" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="access" type="orm:access-type"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="embedded-id"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface EmbeddedId {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="attribute-override" type="orm:attribute-override" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="access" type="orm:access-type"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="entity-listener"> + <xsd:annotation> + <xsd:documentation> + + Defines an entity listener to be invoked at lifecycle events + for the entities that list this listener. + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:element name="pre-persist" type="orm:pre-persist" minOccurs="0"/> + <xsd:element name="post-persist" type="orm:post-persist" + minOccurs="0"/> + <xsd:element name="pre-remove" type="orm:pre-remove" minOccurs="0"/> + <xsd:element name="post-remove" type="orm:post-remove" minOccurs="0"/> + <xsd:element name="pre-update" type="orm:pre-update" minOccurs="0"/> + <xsd:element name="post-update" type="orm:post-update" minOccurs="0"/> + <xsd:element name="post-load" type="orm:post-load" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="class" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="entity-listeners"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface EntityListeners { + Class[] value(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="entity-listener" type="orm:entity-listener" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="entity-result"> + <xsd:annotation> + <xsd:documentation> + + @Target({}) @Retention(RUNTIME) + public @interface EntityResult { + Class entityClass(); + FieldResult[] fields() default {}; + String discriminatorColumn() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="field-result" type="orm:field-result" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="entity-class" type="xsd:string" use="required"/> + <xsd:attribute name="discriminator-column" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:simpleType name="enum-type"> + <xsd:annotation> + <xsd:documentation> + + public enum EnumType { + ORDINAL, + STRING + } + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="ORDINAL"/> + <xsd:enumeration value="STRING"/> + </xsd:restriction> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:simpleType name="enumerated"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Enumerated { + EnumType value() default ORDINAL; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="orm:enum-type"/> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:simpleType name="fetch-type"> + <xsd:annotation> + <xsd:documentation> + + public enum FetchType { LAZY, EAGER }; + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="LAZY"/> + <xsd:enumeration value="EAGER"/> + </xsd:restriction> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:complexType name="field-result"> + <xsd:annotation> + <xsd:documentation> + + @Target({}) @Retention(RUNTIME) + public @interface FieldResult { + String name(); + String column(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="column" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="foreign-key"> + <xsd:annotation> + <xsd:documentation> + + @Target({}) @Retention(RUNTIME) + public @interface ForeignKey { + String name() default ""; + ConstraintMode value() default CONSTRAINT; + String foreign-key-definition() default ""; + + Note that the elements that embed the use of the annotation + default this use as @ForeignKey(PROVIDER_DEFAULT). + + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="constraint-mode" type="orm:constraint-mode"/> + <xsd:attribute name="foreign-key-definition" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="generated-value"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface GeneratedValue { + GenerationType strategy() default AUTO; + String generator() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="strategy" type="orm:generation-type"/> + <xsd:attribute name="generator" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:simpleType name="generation-type"> + <xsd:annotation> + <xsd:documentation> + + public enum GenerationType { TABLE, SEQUENCE, IDENTITY, AUTO }; + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="TABLE"/> + <xsd:enumeration value="SEQUENCE"/> + <xsd:enumeration value="IDENTITY"/> + <xsd:enumeration value="AUTO"/> + </xsd:restriction> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:complexType name="id"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Id {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="column" type="orm:column" + minOccurs="0"/> + <xsd:element name="generated-value" type="orm:generated-value" + minOccurs="0"/> + <xsd:element name="temporal" type="orm:temporal" + minOccurs="0"/> + <xsd:element name="table-generator" type="orm:table-generator" + minOccurs="0"/> + <xsd:element name="sequence-generator" type="orm:sequence-generator" + minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="access" type="orm:access-type"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="id-class"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface IdClass { + Class value(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="class" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="index"> + <xsd:annotation> + <xsd:documentation> + + @Target({}) @Retention(RUNTIME) + public @interface Index { + String name() default ""; + String columnList(); + boolean unique() default false; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="column-list" type="xsd:string" use="required"/> + <xsd:attribute name="unique" type="xsd:boolean"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="inheritance"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface Inheritance { + InheritanceType strategy() default SINGLE_TABLE; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="strategy" type="orm:inheritance-type"/> + </xsd:complexType> + + <!-- **************************************************** --> + + <xsd:simpleType name="inheritance-type"> + <xsd:annotation> + <xsd:documentation> + + public enum InheritanceType + { SINGLE_TABLE, JOINED, TABLE_PER_CLASS}; + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="SINGLE_TABLE"/> + <xsd:enumeration value="JOINED"/> + <xsd:enumeration value="TABLE_PER_CLASS"/> + </xsd:restriction> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:complexType name="join-column"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface JoinColumn { + String name() default ""; + String referencedColumnName() default ""; + boolean unique() default false; + boolean nullable() default true; + boolean insertable() default true; + boolean updatable() default true; + String columnDefinition() default ""; + String table() default ""; + ForeignKey foreignKey() default @ForeignKey(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="referenced-column-name" type="xsd:string"/> + <xsd:attribute name="unique" type="xsd:boolean"/> + <xsd:attribute name="nullable" type="xsd:boolean"/> + <xsd:attribute name="insertable" type="xsd:boolean"/> + <xsd:attribute name="updatable" type="xsd:boolean"/> + <xsd:attribute name="column-definition" type="xsd:string"/> + <xsd:attribute name="table" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="join-table"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface JoinTable { + String name() default ""; + String catalog() default ""; + String schema() default ""; + JoinColumn[] joinColumns() default {}; + JoinColumn[] inverseJoinColumns() default {}; + UniqueConstraint[] uniqueConstraints() default {}; + Index[] indexes() default {}; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:sequence> + <xsd:element name="join-column" type="orm:join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="foreign-key" type="orm:foreign-key" + minOccurs="0"/> + </xsd:sequence> + <xsd:sequence> + <xsd:element name="inverse-join-column" type="orm:join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="inverse-foreign-key" type="orm:foreign-key" + minOccurs="0"/> + </xsd:sequence> + <xsd:element name="unique-constraint" type="orm:unique-constraint" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="index" type="orm:index" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="catalog" type="xsd:string"/> + <xsd:attribute name="schema" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="lob"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Lob {} + + </xsd:documentation> + </xsd:annotation> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:simpleType name="lock-mode-type"> + <xsd:annotation> + <xsd:documentation> + + public enum LockModeType { READ, WRITE, OPTIMISTIC, OPTIMISTIC_FORCE_INCREMENT, PESSIMISTIC_READ, PESSIMISTIC_WRITE, PESSIMISTIC_FORCE_INCREMENT, NONE}; + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="READ"/> + <xsd:enumeration value="WRITE"/> + <xsd:enumeration value="OPTIMISTIC"/> + <xsd:enumeration value="OPTIMISTIC_FORCE_INCREMENT"/> + <xsd:enumeration value="PESSIMISTIC_READ"/> + <xsd:enumeration value="PESSIMISTIC_WRITE"/> + <xsd:enumeration value="PESSIMISTIC_FORCE_INCREMENT"/> + <xsd:enumeration value="NONE"/> + + </xsd:restriction> + </xsd:simpleType> + +<!-- **************************************************** --> + +<xsd:complexType name="many-to-many"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface ManyToMany { + Class targetEntity() default void.class; + CascadeType[] cascade() default {}; + FetchType fetch() default LAZY; + String mappedBy() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:choice> + <xsd:element name="order-by" type="orm:order-by" + minOccurs="0"/> + <xsd:element name="order-column" type="orm:order-column" + minOccurs="0"/> + </xsd:choice> + <xsd:choice> + <xsd:element name="map-key" type="orm:map-key" + minOccurs="0"/> + <xsd:sequence> + <xsd:element name="map-key-class" type="orm:map-key-class" + minOccurs="0"/> + <xsd:choice> + <xsd:element name="map-key-temporal" + type="orm:temporal" + minOccurs="0"/> + <xsd:element name="map-key-enumerated" + type="orm:enumerated" + minOccurs="0"/> + <xsd:sequence> + <xsd:element name="map-key-attribute-override" + type="orm:attribute-override" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="map-key-convert" type="orm:convert" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:choice> + <xsd:choice> + <xsd:element name="map-key-column" type="orm:map-key-column" + minOccurs="0"/> + <xsd:sequence> + <xsd:element name="map-key-join-column" + type="orm:map-key-join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="map-key-foreign-key" + type="orm:foreign-key" + minOccurs="0"/> + </xsd:sequence> + </xsd:choice> + </xsd:sequence> + </xsd:choice> + <xsd:element name="join-table" type="orm:join-table" + minOccurs="0"/> + <xsd:element name="cascade" type="orm:cascade-type" + minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="target-entity" type="xsd:string"/> + <xsd:attribute name="fetch" type="orm:fetch-type"/> + <xsd:attribute name="access" type="orm:access-type"/> + <xsd:attribute name="mapped-by" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="many-to-one"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface ManyToOne { + Class targetEntity() default void.class; + CascadeType[] cascade() default {}; + FetchType fetch() default EAGER; + boolean optional() default true; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:choice> + <xsd:sequence> + <xsd:element name="join-column" type="orm:join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="foreign-key" type="orm:foreign-key" + minOccurs="0"/> + </xsd:sequence> + <xsd:element name="join-table" type="orm:join-table" + minOccurs="0"/> + </xsd:choice> + <xsd:element name="cascade" type="orm:cascade-type" + minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="target-entity" type="xsd:string"/> + <xsd:attribute name="fetch" type="orm:fetch-type"/> + <xsd:attribute name="optional" type="xsd:boolean"/> + <xsd:attribute name="access" type="orm:access-type"/> + <xsd:attribute name="maps-id" type="xsd:string"/> + <xsd:attribute name="id" type="xsd:boolean"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="map-key"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface MapKey { + String name() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="map-key-class"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface MapKeyClass { + Class value(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="class" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="map-key-column"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface MapKeyColumn { + String name() default ""; + boolean unique() default false; + boolean nullable() default false; + boolean insertable() default true; + boolean updatable() default true; + String columnDefinition() default ""; + String table() default ""; + int length() default 255; + int precision() default 0; // decimal precision + int scale() default 0; // decimal scale + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="unique" type="xsd:boolean"/> + <xsd:attribute name="nullable" type="xsd:boolean"/> + <xsd:attribute name="insertable" type="xsd:boolean"/> + <xsd:attribute name="updatable" type="xsd:boolean"/> + <xsd:attribute name="column-definition" type="xsd:string"/> + <xsd:attribute name="table" type="xsd:string"/> + <xsd:attribute name="length" type="xsd:int"/> + <xsd:attribute name="precision" type="xsd:int"/> + <xsd:attribute name="scale" type="xsd:int"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="map-key-join-column"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface MapKeyJoinColumn { + String name() default ""; + String referencedColumnName() default ""; + boolean unique() default false; + boolean nullable() default false; + boolean insertable() default true; + boolean updatable() default true; + String columnDefinition() default ""; + String table() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="referenced-column-name" type="xsd:string"/> + <xsd:attribute name="unique" type="xsd:boolean"/> + <xsd:attribute name="nullable" type="xsd:boolean"/> + <xsd:attribute name="insertable" type="xsd:boolean"/> + <xsd:attribute name="updatable" type="xsd:boolean"/> + <xsd:attribute name="column-definition" type="xsd:string"/> + <xsd:attribute name="table" type="xsd:string"/> + </xsd:complexType> + + +<!-- **************************************************** --> + + <xsd:complexType name="mapped-superclass"> + <xsd:annotation> + <xsd:documentation> + + Defines the settings and mappings for a mapped superclass. Is + allowed to be sparsely populated and used in conjunction with + the annotations. Alternatively, the metadata-complete attribute + can be used to indicate that no annotations are to be processed + If this is the case then the defaulting rules will be recursively + applied. + + @Target(TYPE) @Retention(RUNTIME) + public @interface MappedSuperclass{} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:element name="id-class" type="orm:id-class" minOccurs="0"/> + <xsd:element name="exclude-default-listeners" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="exclude-superclass-listeners" type="orm:emptyType" + minOccurs="0"/> + <xsd:element name="entity-listeners" type="orm:entity-listeners" + minOccurs="0"/> + <xsd:element name="pre-persist" type="orm:pre-persist" minOccurs="0"/> + <xsd:element name="post-persist" type="orm:post-persist" + minOccurs="0"/> + <xsd:element name="pre-remove" type="orm:pre-remove" minOccurs="0"/> + <xsd:element name="post-remove" type="orm:post-remove" minOccurs="0"/> + <xsd:element name="pre-update" type="orm:pre-update" minOccurs="0"/> + <xsd:element name="post-update" type="orm:post-update" minOccurs="0"/> + <xsd:element name="post-load" type="orm:post-load" minOccurs="0"/> + <xsd:element name="attributes" type="orm:attributes" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="class" type="xsd:string" use="required"/> + <xsd:attribute name="access" type="orm:access-type"/> + <xsd:attribute name="metadata-complete" type="xsd:boolean"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="named-attribute-node"> + <xsd:annotation> + <xsd:documentation> + + @Target({}) @Retention(RUNTIME) + public @interface NamedAttributeNode { + String value(); + String subgraph() default ""; + String keySubgraph() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="subgraph" type="xsd:string"/> + <xsd:attribute name="key-subgraph" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="named-entity-graph"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface NamedEntityGraph { + String name() default ""; + NamedAttributeNode[] attributeNodes() default {}; + boolean includeAllAttributes() default false; + NamedSubgraph[] subgraphs() default {}; + NamedSubGraph[] subclassSubgraphs() default {}; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="named-attribute-node" + type="orm:named-attribute-node" + minOccurs="0" + maxOccurs="unbounded"/> + <xsd:element name="subgraph" + type="orm:named-subgraph" + minOccurs="0" + maxOccurs="unbounded"/> + <xsd:element name="subclass-subgraph" + type="orm:named-subgraph" + minOccurs="0" + maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="include-all-attributes" type="xsd:boolean"/> + </xsd:complexType> + + +<!-- **************************************************** --> + + <xsd:complexType name="named-native-query"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface NamedNativeQuery { + String name(); + String query(); + QueryHint[] hints() default {}; + Class resultClass() default void.class; + String resultSetMapping() default ""; //named SqlResultSetMapping + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:element name="query" type="xsd:string"/> + <xsd:element name="hint" type="orm:query-hint" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="result-class" type="xsd:string"/> + <xsd:attribute name="result-set-mapping" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="named-query"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface NamedQuery { + String name(); + String query(); + LockModeType lockMode() default NONE; + QueryHint[] hints() default {}; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:element name="query" type="xsd:string"/> + <xsd:element name="lock-mode" type="orm:lock-mode-type" minOccurs="0"/> + <xsd:element name="hint" type="orm:query-hint" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> +</xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="named-stored-procedure-query"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface NamedStoredProcedureQuery { + String name(); + String procedureName(); + StoredProcedureParameter[] parameters() default {}; + Class[] resultClasses() default {}; + String[] resultSetMappings() default{}; + QueryHint[] hints() default {}; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:element name="parameter" + type="orm:stored-procedure-parameter" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="result-class" type="xsd:string" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="result-set-mapping" type="xsd:string" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="hint" type="orm:query-hint" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="procedure-name" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="named-subgraph"> + <xsd:annotation> + <xsd:documentation> + + @Target({}) @Retention(RUNTIME) + public @interface NamedSubgraph { + String name(); + Class type() default void.class; + NamedAttributeNode[] attributeNodes(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="named-attribute-node" + type="orm:named-attribute-node" + minOccurs="0" + maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="class" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + +<xsd:complexType name="one-to-many"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface OneToMany { + Class targetEntity() default void.class; + CascadeType[] cascade() default {}; + FetchType fetch() default LAZY; + String mappedBy() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:choice> + <xsd:element name="order-by" type="orm:order-by" + minOccurs="0"/> + <xsd:element name="order-column" type="orm:order-column" + minOccurs="0"/> + </xsd:choice> + <xsd:choice> + <xsd:element name="map-key" type="orm:map-key" + minOccurs="0"/> + <xsd:sequence> + <xsd:element name="map-key-class" type="orm:map-key-class" + minOccurs="0"/> + <xsd:choice> + <xsd:element name="map-key-temporal" + type="orm:temporal" + minOccurs="0"/> + <xsd:element name="map-key-enumerated" + type="orm:enumerated" + minOccurs="0"/> + <xsd:sequence> + <xsd:element name="map-key-attribute-override" + type="orm:attribute-override" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="map-key-convert" type="orm:convert" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:choice> + <xsd:choice> + <xsd:element name="map-key-column" type="orm:map-key-column" + minOccurs="0"/> + <xsd:sequence> + <xsd:element name="map-key-join-column" + type="orm:map-key-join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="map-key-foreign-key" + type="orm:foreign-key" + minOccurs="0"/> + </xsd:sequence> + </xsd:choice> + </xsd:sequence> + </xsd:choice> + <xsd:choice> + <xsd:element name="join-table" type="orm:join-table" + minOccurs="0"/> + <xsd:sequence> + <xsd:element name="join-column" type="orm:join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="foreign-key" type="orm:foreign-key" + minOccurs="0"/> + </xsd:sequence> + </xsd:choice> + <xsd:element name="cascade" type="orm:cascade-type" + minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="target-entity" type="xsd:string"/> + <xsd:attribute name="fetch" type="orm:fetch-type"/> + <xsd:attribute name="access" type="orm:access-type"/> + <xsd:attribute name="mapped-by" type="xsd:string"/> + <xsd:attribute name="orphan-removal" type="xsd:boolean"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="one-to-one"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface OneToOne { + Class targetEntity() default void.class; + CascadeType[] cascade() default {}; + FetchType fetch() default EAGER; + boolean optional() default true; + String mappedBy() default ""; + boolean orphanRemoval() default false; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:choice> + <xsd:sequence> + <xsd:element name="primary-key-join-column" + type="orm:primary-key-join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="primary-key-foreign-key" + type="orm:foreign-key" + minOccurs="0"/> + </xsd:sequence> + <xsd:sequence> + <xsd:element name="join-column" type="orm:join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="foreign-key" type="orm:foreign-key" + minOccurs="0"/> + </xsd:sequence> + <xsd:element name="join-table" type="orm:join-table" + minOccurs="0"/> + </xsd:choice> + <xsd:element name="cascade" type="orm:cascade-type" + minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="target-entity" type="xsd:string"/> + <xsd:attribute name="fetch" type="orm:fetch-type"/> + <xsd:attribute name="optional" type="xsd:boolean"/> + <xsd:attribute name="access" type="orm:access-type"/> + <xsd:attribute name="mapped-by" type="xsd:string"/> + <xsd:attribute name="orphan-removal" type="xsd:boolean"/> + <xsd:attribute name="maps-id" type="xsd:string"/> + <xsd:attribute name="id" type="xsd:boolean"/> +</xsd:complexType> + +<!-- **************************************************** --> + + <xsd:simpleType name="order-by"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface OrderBy { + String value() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:string"/> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:complexType name="order-column"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface OrderColumn { + String name() default ""; + boolean nullable() default true; + boolean insertable() default true; + boolean updatable() default true; + String columnDefinition() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="nullable" type="xsd:boolean"/> + <xsd:attribute name="insertable" type="xsd:boolean"/> + <xsd:attribute name="updatable" type="xsd:boolean"/> + <xsd:attribute name="column-definition" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:simpleType name="parameter-mode"> + <xsd:annotation> + <xsd:documentation> + + public enum ParameterMode { IN, INOUT, OUT, REF_CURSOR}; + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="IN"/> + <xsd:enumeration value="INOUT"/> + <xsd:enumeration value="OUT"/> + <xsd:enumeration value="REF_CURSOR"/> + </xsd:restriction> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:complexType name="post-load"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PostLoad {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="method-name" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="post-persist"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PostPersist {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="method-name" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="post-remove"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PostRemove {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="method-name" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="post-update"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PostUpdate {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="method-name" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="pre-persist"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PrePersist {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="method-name" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="pre-remove"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PreRemove {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="method-name" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="pre-update"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PreUpdate {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="method-name" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="primary-key-join-column"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME) + public @interface PrimaryKeyJoinColumn { + String name() default ""; + String referencedColumnName() default ""; + String columnDefinition() default ""; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="referenced-column-name" type="xsd:string"/> + <xsd:attribute name="column-definition" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="query-hint"> + <xsd:annotation> + <xsd:documentation> + + @Target({}) @Retention(RUNTIME) + public @interface QueryHint { + String name(); + String value(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="value" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="secondary-table"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface SecondaryTable { + String name(); + String catalog() default ""; + String schema() default ""; + PrimaryKeyJoinColumn[] pkJoinColumns() default {}; + UniqueConstraint[] uniqueConstraints() default {}; + Index[] indexes() default {}; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:sequence> + <xsd:element name="primary-key-join-column" + type="orm:primary-key-join-column" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="primary-key-foreign-key" + type="orm:foreign-key" + minOccurs="0"/> + </xsd:sequence> + <xsd:element name="unique-constraint" type="orm:unique-constraint" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="index" type="orm:index" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="catalog" type="xsd:string"/> + <xsd:attribute name="schema" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="sequence-generator"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME) + public @interface SequenceGenerator { + String name(); + String sequenceName() default ""; + String catalog() default ""; + String schema() default ""; + int initialValue() default 1; + int allocationSize() default 50; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="sequence-name" type="xsd:string"/> + <xsd:attribute name="catalog" type="xsd:string"/> + <xsd:attribute name="schema" type="xsd:string"/> + <xsd:attribute name="initial-value" type="xsd:int"/> + <xsd:attribute name="allocation-size" type="xsd:int"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="sql-result-set-mapping"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface SqlResultSetMapping { + String name(); + EntityResult[] entities() default {}; + ConstructorResult[] classes() default{}; + ColumnResult[] columns() default {}; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:element name="entity-result" type="orm:entity-result" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="constructor-result" type="orm:constructor-result" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="column-result" type="orm:column-result" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="stored-procedure-parameter"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface StoredProcedureParameter { + String name() default ""; + ParameterMode mode() default ParameterMode.IN; + Class type(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" + minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="class" type="xsd:string" use="required"/> + <xsd:attribute name="mode" type="orm:parameter-mode"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="table"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE}) @Retention(RUNTIME) + public @interface Table { + String name() default ""; + String catalog() default ""; + String schema() default ""; + UniqueConstraint[] uniqueConstraints() default {}; + Index[] indexes() default {}; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="unique-constraint" type="orm:unique-constraint" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="index" type="orm:index" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="catalog" type="xsd:string"/> + <xsd:attribute name="schema" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="table-generator"> + <xsd:annotation> + <xsd:documentation> + + @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME) + public @interface TableGenerator { + String name(); + String table() default ""; + String catalog() default ""; + String schema() default ""; + String pkColumnName() default ""; + String valueColumnName() default ""; + String pkColumnValue() default ""; + int initialValue() default 0; + int allocationSize() default 50; + UniqueConstraint[] uniqueConstraints() default {}; + Indexes[] indexes() default {}; + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" minOccurs="0"/> + <xsd:element name="unique-constraint" type="orm:unique-constraint" + minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="index" type="orm:index" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="table" type="xsd:string"/> + <xsd:attribute name="catalog" type="xsd:string"/> + <xsd:attribute name="schema" type="xsd:string"/> + <xsd:attribute name="pk-column-name" type="xsd:string"/> + <xsd:attribute name="value-column-name" type="xsd:string"/> + <xsd:attribute name="pk-column-value" type="xsd:string"/> + <xsd:attribute name="initial-value" type="xsd:int"/> + <xsd:attribute name="allocation-size" type="xsd:int"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:simpleType name="temporal"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Temporal { + TemporalType value(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="orm:temporal-type"/> + </xsd:simpleType> + + <!-- **************************************************** --> + + <xsd:simpleType name="temporal-type"> + <xsd:annotation> + <xsd:documentation> + + public enum TemporalType { + DATE, // java.sql.Date + TIME, // java.sql.Time + TIMESTAMP // java.sql.Timestamp + } + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="DATE"/> + <xsd:enumeration value="TIME"/> + <xsd:enumeration value="TIMESTAMP"/> + </xsd:restriction> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:complexType name="transient"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Transient {} + + </xsd:documentation> + </xsd:annotation> + <xsd:attribute name="name" type="xsd:string" use="required"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="unique-constraint"> + <xsd:annotation> + <xsd:documentation> + + @Target({}) @Retention(RUNTIME) + public @interface UniqueConstraint { + String name() default ""; + String[] columnNames(); + } + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="column-name" type="xsd:string" + maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="version"> + <xsd:annotation> + <xsd:documentation> + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Version {} + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="column" type="orm:column" minOccurs="0"/> + <xsd:element name="temporal" type="orm:temporal" minOccurs="0"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="access" type="orm:access-type"/> + </xsd:complexType> + +</xsd:schema> diff --git a/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/resources/persistence_1_0.xsd b/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/resources/persistence_1_0.xsd new file mode 100644 index 000000000..9f3c2568c --- /dev/null +++ b/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/resources/persistence_1_0.xsd @@ -0,0 +1,308 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- persistence.xml schema --> +<xsd:schema targetNamespace="http://java.sun.com/xml/ns/persistence" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:persistence="http://java.sun.com/xml/ns/persistence" + elementFormDefault="qualified" + attributeFormDefault="unqualified" + version="1.0"> + + <xsd:annotation> + <xsd:documentation> + @(#)persistence_1_0.xsd 1.0 Feb 9 2006 + </xsd:documentation> + </xsd:annotation> + + <xsd:annotation> + <xsd:documentation> + + DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + + Copyright 2005-2010 Oracle and/or its affiliates. All rights reserved. + +Oracle and Java are registered trademarks of Oracle and/or its affiliates. +Other names may be trademarks of their respective owners. + + The contents of this file are subject to the terms of either the + GNU General Public License Version 2 only ("GPL") or the Common + Development and Distribution License("CDDL") (collectively, the + "License"). You may not use this file except in compliance with + the License. You can obtain a copy of the License at + https://glassfish.dev.java.net/public/CDDL+GPL.html or + glassfish/bootstrap/legal/LICENSE.txt. See the License for the + specific language governing permissions and limitations under the + License. + + When distributing the software, include this License Header + Notice in each file and include the License file at + glassfish/bootstrap/legal/LICENSE.txt. Sun designates this + particular file as subject to the "Classpath" exception as + provided by Oracle in the GPL Version 2 section of the License file + that accompanied this code. If applicable, add the following + below the License Header, with the fields enclosed by brackets [] + replaced by your own identifying information: + "Portions Copyrighted [year] [name of copyright owner]" + + Contributor(s): + + If you wish your version of this file to be governed by only the + CDDL or only the GPL Version 2, indicate your decision by adding + "[Contributor] elects to include this software in this + distribution under the [CDDL or GPL Version 2] license." If you + don't indicate a single choice of license, a recipient has the + option to distribute your version of this file under either the + CDDL, the GPL Version 2 or to extend the choice of license to its + licensees as provided above. However, if you add GPL Version 2 + code and therefore, elected the GPL Version 2 license, then the + option applies only if the new code is made subject to such + option by the copyright holder. + + </xsd:documentation> + </xsd:annotation> + + <xsd:annotation> + <xsd:documentation><![CDATA[ + + This is the XML Schema for the persistence configuration file. + The file must be named "META-INF/persistence.xml" in the + persistence archive. + Persistence configuration files must indicate + the persistence schema by using the persistence namespace: + + http://java.sun.com/xml/ns/persistence + + and indicate the version of the schema by + using the version element as shown below: + + <persistence xmlns="http://java.sun.com/xml/ns/persistence" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence + http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" + version="1.0"> + ... + </persistence> + + ]]></xsd:documentation> + </xsd:annotation> + + <xsd:simpleType name="versionType"> + <xsd:restriction base="xsd:token"> + <xsd:pattern value="[0-9]+(\.[0-9]+)*"/> + </xsd:restriction> + </xsd:simpleType> + + <!-- **************************************************** --> + + <xsd:element name="persistence"> + <xsd:complexType> + <xsd:sequence> + + <!-- **************************************************** --> + + <xsd:element name="persistence-unit" + minOccurs="0" maxOccurs="unbounded"> + <xsd:complexType> + <xsd:annotation> + <xsd:documentation> + + Configuration of a persistence unit. + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + + <!-- **************************************************** --> + + <xsd:element name="description" type="xsd:string" + minOccurs="0"> + <xsd:annotation> + <xsd:documentation> + + Textual description of this persistence unit. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:element name="provider" type="xsd:string" + minOccurs="0"> + <xsd:annotation> + <xsd:documentation> + + Provider class that supplies EntityManagers for this + persistence unit. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:element name="jta-data-source" type="xsd:string" + minOccurs="0"> + <xsd:annotation> + <xsd:documentation> + + The container-specific name of the JTA datasource to use. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:element name="non-jta-data-source" type="xsd:string" + minOccurs="0"> + <xsd:annotation> + <xsd:documentation> + + The container-specific name of a non-JTA datasource to use. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:element name="mapping-file" type="xsd:string" + minOccurs="0" maxOccurs="unbounded"> + <xsd:annotation> + <xsd:documentation> + + File containing mapping information. Loaded as a resource + by the persistence provider. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:element name="jar-file" type="xsd:string" + minOccurs="0" maxOccurs="unbounded"> + <xsd:annotation> + <xsd:documentation> + + Jar file that should be scanned for entities. + Not applicable to Java SE persistence units. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:element name="class" type="xsd:string" + minOccurs="0" maxOccurs="unbounded"> + <xsd:annotation> + <xsd:documentation> + + Class to scan for annotations. It should be annotated + with either @Entity, @Embeddable or @MappedSuperclass. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:element name="exclude-unlisted-classes" type="xsd:boolean" + default="false" minOccurs="0"> + <xsd:annotation> + <xsd:documentation> + + When set to true then only listed classes and jars will + be scanned for persistent classes, otherwise the enclosing + jar or directory will also be scanned. Not applicable to + Java SE persistence units. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:element name="properties" minOccurs="0"> + <xsd:annotation> + <xsd:documentation> + + A list of vendor-specific properties. + + </xsd:documentation> + </xsd:annotation> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="property" + minOccurs="0" maxOccurs="unbounded"> + <xsd:annotation> + <xsd:documentation> + A name-value pair. + </xsd:documentation> + </xsd:annotation> + <xsd:complexType> + <xsd:attribute name="name" type="xsd:string" + use="required"/> + <xsd:attribute name="value" type="xsd:string" + use="required"/> + </xsd:complexType> + </xsd:element> + </xsd:sequence> + </xsd:complexType> + </xsd:element> + + </xsd:sequence> + + <!-- **************************************************** --> + + <xsd:attribute name="name" type="xsd:string" use="required"> + <xsd:annotation> + <xsd:documentation> + + Name used in code to reference this persistence unit. + + </xsd:documentation> + </xsd:annotation> + </xsd:attribute> + + <!-- **************************************************** --> + + <xsd:attribute name="transaction-type" + type="persistence:persistence-unit-transaction-type"> + <xsd:annotation> + <xsd:documentation> + + Type of transactions used by EntityManagers from this + persistence unit. + + </xsd:documentation> + </xsd:annotation> + </xsd:attribute> + + </xsd:complexType> + </xsd:element> + </xsd:sequence> + <xsd:attribute name="version" type="persistence:versionType" + fixed="1.0" use="required"/> + </xsd:complexType> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:simpleType name="persistence-unit-transaction-type"> + <xsd:annotation> + <xsd:documentation> + + public enum TransactionType { JTA, RESOURCE_LOCAL }; + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="JTA"/> + <xsd:enumeration value="RESOURCE_LOCAL"/> + </xsd:restriction> + </xsd:simpleType> + +</xsd:schema> + diff --git a/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/resources/persistence_2_0.xsd b/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/resources/persistence_2_0.xsd new file mode 100644 index 000000000..323bd8bc0 --- /dev/null +++ b/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/resources/persistence_2_0.xsd @@ -0,0 +1,355 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- persistence.xml schema --> +<xsd:schema targetNamespace="http://java.sun.com/xml/ns/persistence" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:persistence="http://java.sun.com/xml/ns/persistence" + elementFormDefault="qualified" + attributeFormDefault="unqualified" + version="2.0"> + + <xsd:annotation> + <xsd:documentation> + @(#)persistence_2_0.xsd 1.0 October 1 2009 + </xsd:documentation> + </xsd:annotation> + + <xsd:annotation> + <xsd:documentation> + + Copyright (c) 2008, 2009 Sun Microsystems. All rights reserved. + + This program and the accompanying materials are made available under the + terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0 + which accompanies this distribution. + The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html + and the Eclipse Distribution License is available at + http://www.eclipse.org/org/documents/edl-v10.php. + + Contributors: + Linda DeMichiel - Java Persistence 2.0, Version 2.0 (October 1, 2009) + Specification available from http://jcp.org/en/jsr/detail?id=317 + + </xsd:documentation> + </xsd:annotation> + + <xsd:annotation> + <xsd:documentation><![CDATA[ + + This is the XML Schema for the persistence configuration file. + The file must be named "META-INF/persistence.xml" in the + persistence archive. + + Persistence configuration files must indicate + the persistence schema by using the persistence namespace: + + http://java.sun.com/xml/ns/persistence + + and indicate the version of the schema by + using the version element as shown below: + + <persistence xmlns="http://java.sun.com/xml/ns/persistence" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence + http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" + version="2.0"> + ... + </persistence> + + ]]> + </xsd:documentation> + </xsd:annotation> + + <xsd:simpleType name="versionType"> + <xsd:restriction base="xsd:token"> + <xsd:pattern value="[0-9]+(\.[0-9]+)*"/> + </xsd:restriction> + </xsd:simpleType> + + <!-- **************************************************** --> + + <xsd:element name="persistence"> + <xsd:complexType> + <xsd:sequence> + + <!-- **************************************************** --> + + <xsd:element name="persistence-unit" + minOccurs="1" maxOccurs="unbounded"> + <xsd:complexType> + <xsd:annotation> + <xsd:documentation> + + Configuration of a persistence unit. + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + + <!-- **************************************************** --> + + <xsd:element name="description" type="xsd:string" + minOccurs="0"> + <xsd:annotation> + <xsd:documentation> + + Description of this persistence unit. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:element name="provider" type="xsd:string" + minOccurs="0"> + <xsd:annotation> + <xsd:documentation> + + Provider class that supplies EntityManagers for this + persistence unit. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:element name="jta-data-source" type="xsd:string" + minOccurs="0"> + <xsd:annotation> + <xsd:documentation> + + The container-specific name of the JTA datasource to use. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:element name="non-jta-data-source" type="xsd:string" + minOccurs="0"> + <xsd:annotation> + <xsd:documentation> + + The container-specific name of a non-JTA datasource to use. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:element name="mapping-file" type="xsd:string" + minOccurs="0" maxOccurs="unbounded"> + <xsd:annotation> + <xsd:documentation> + + File containing mapping information. Loaded as a resource + by the persistence provider. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:element name="jar-file" type="xsd:string" + minOccurs="0" maxOccurs="unbounded"> + <xsd:annotation> + <xsd:documentation> + + Jar file that is to be scanned for managed classes. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:element name="class" type="xsd:string" + minOccurs="0" maxOccurs="unbounded"> + <xsd:annotation> + <xsd:documentation> + + Managed class to be included in the persistence unit and + to scan for annotations. It should be annotated + with either @Entity, @Embeddable or @MappedSuperclass. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:element name="exclude-unlisted-classes" type="xsd:boolean" + default="true" minOccurs="0"> + <xsd:annotation> + <xsd:documentation> + + When set to true then only listed classes and jars will + be scanned for persistent classes, otherwise the + enclosing jar or directory will also be scanned. + Not applicable to Java SE persistence units. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:element name="shared-cache-mode" + type="persistence:persistence-unit-caching-type" + minOccurs="0"> + <xsd:annotation> + <xsd:documentation> + + Defines whether caching is enabled for the + persistence unit if caching is supported by the + persistence provider. When set to ALL, all entities + will be cached. When set to NONE, no entities will + be cached. When set to ENABLE_SELECTIVE, only entities + specified as cacheable will be cached. When set to + DISABLE_SELECTIVE, entities specified as not cacheable + will not be cached. When not specified or when set to + UNSPECIFIED, provider defaults may apply. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:element name="validation-mode" + type="persistence:persistence-unit-validation-mode-type" + minOccurs="0"> + <xsd:annotation> + <xsd:documentation> + + The validation mode to be used for the persistence unit. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + + <!-- **************************************************** --> + + <xsd:element name="properties" minOccurs="0"> + <xsd:annotation> + <xsd:documentation> + + A list of standard and vendor-specific properties + and hints. + + </xsd:documentation> + </xsd:annotation> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="property" + minOccurs="0" maxOccurs="unbounded"> + <xsd:annotation> + <xsd:documentation> + A name-value pair. + </xsd:documentation> + </xsd:annotation> + <xsd:complexType> + <xsd:attribute name="name" type="xsd:string" + use="required"/> + <xsd:attribute name="value" type="xsd:string" + use="required"/> + </xsd:complexType> + </xsd:element> + </xsd:sequence> + </xsd:complexType> + </xsd:element> + + </xsd:sequence> + + <!-- **************************************************** --> + + <xsd:attribute name="name" type="xsd:string" use="required"> + <xsd:annotation> + <xsd:documentation> + + Name used in code to reference this persistence unit. + + </xsd:documentation> + </xsd:annotation> + </xsd:attribute> + + <!-- **************************************************** --> + + <xsd:attribute name="transaction-type" + type="persistence:persistence-unit-transaction-type"> + <xsd:annotation> + <xsd:documentation> + + Type of transactions used by EntityManagers from this + persistence unit. + + </xsd:documentation> + </xsd:annotation> + </xsd:attribute> + + </xsd:complexType> + </xsd:element> + </xsd:sequence> + <xsd:attribute name="version" type="persistence:versionType" + fixed="2.0" use="required"/> + </xsd:complexType> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:simpleType name="persistence-unit-transaction-type"> + <xsd:annotation> + <xsd:documentation> + + public enum PersistenceUnitTransactionType {JTA, RESOURCE_LOCAL}; + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="JTA"/> + <xsd:enumeration value="RESOURCE_LOCAL"/> + </xsd:restriction> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:simpleType name="persistence-unit-caching-type"> + <xsd:annotation> + <xsd:documentation> + + public enum SharedCacheMode { ALL, NONE, ENABLE_SELECTIVE, DISABLE_SELECTIVE, UNSPECIFIED}; + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="ALL"/> + <xsd:enumeration value="NONE"/> + <xsd:enumeration value="ENABLE_SELECTIVE"/> + <xsd:enumeration value="DISABLE_SELECTIVE"/> + <xsd:enumeration value="UNSPECIFIED"/> + </xsd:restriction> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:simpleType name="persistence-unit-validation-mode-type"> + <xsd:annotation> + <xsd:documentation> + + public enum ValidationMode { AUTO, CALLBACK, NONE}; + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="AUTO"/> + <xsd:enumeration value="CALLBACK"/> + <xsd:enumeration value="NONE"/> + </xsd:restriction> + </xsd:simpleType> + +</xsd:schema> diff --git a/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/resources/persistence_2_1.xsd b/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/resources/persistence_2_1.xsd new file mode 100644 index 000000000..01d514902 --- /dev/null +++ b/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/resources/persistence_2_1.xsd @@ -0,0 +1,354 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- persistence.xml schema --> +<xsd:schema targetNamespace="http://xmlns.jcp.org/xml/ns/persistence" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:persistence="http://xmlns.jcp.org/xml/ns/persistence" + elementFormDefault="qualified" + attributeFormDefault="unqualified" + version="2.1"> + + <xsd:annotation> + <xsd:documentation> + @(#)persistence_2_1.xsd 2.1 February 4, 2013 + </xsd:documentation> + </xsd:annotation> + + <xsd:annotation> + <xsd:documentation> + + Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved. + + This program and the accompanying materials are made available under the + terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0 + which accompanies this distribution. + The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html + and the Eclipse Distribution License is available at + http://www.eclipse.org/org/documents/edl-v10.php. + + Contributors: + Linda DeMichiel - Java Persistence 2.1, Version 2.1 (February 4, 2013) + Specification available from http://jcp.org/en/jsr/detail?id=338 + + </xsd:documentation> + </xsd:annotation> + + <xsd:annotation> + <xsd:documentation><![CDATA[ + + This is the XML Schema for the persistence configuration file. + The file must be named "META-INF/persistence.xml" in the + persistence archive. + + Persistence configuration files must indicate + the persistence schema by using the persistence namespace: + + http://xmlns.jcp.org/xml/ns/persistence + + and indicate the version of the schema by + using the version element as shown below: + + <persistence xmlns="http://xmlns.jcp.org/xml/ns/persistence" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence + http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd" + version="2.1"> + ... + </persistence> + + ]]></xsd:documentation> + </xsd:annotation> + + <xsd:simpleType name="versionType"> + <xsd:restriction base="xsd:token"> + <xsd:pattern value="[0-9]+(\.[0-9]+)*"/> + </xsd:restriction> + </xsd:simpleType> + + <!-- **************************************************** --> + + <xsd:element name="persistence"> + <xsd:complexType> + <xsd:sequence> + + <!-- **************************************************** --> + + <xsd:element name="persistence-unit" + minOccurs="1" maxOccurs="unbounded"> + <xsd:complexType> + <xsd:annotation> + <xsd:documentation> + + Configuration of a persistence unit. + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + + <!-- **************************************************** --> + + <xsd:element name="description" type="xsd:string" + minOccurs="0"> + <xsd:annotation> + <xsd:documentation> + + Description of this persistence unit. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:element name="provider" type="xsd:string" + minOccurs="0"> + <xsd:annotation> + <xsd:documentation> + + Provider class that supplies EntityManagers for this + persistence unit. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:element name="jta-data-source" type="xsd:string" + minOccurs="0"> + <xsd:annotation> + <xsd:documentation> + + The container-specific name of the JTA datasource to use. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:element name="non-jta-data-source" type="xsd:string" + minOccurs="0"> + <xsd:annotation> + <xsd:documentation> + + The container-specific name of a non-JTA datasource to use. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:element name="mapping-file" type="xsd:string" + minOccurs="0" maxOccurs="unbounded"> + <xsd:annotation> + <xsd:documentation> + + File containing mapping information. Loaded as a resource + by the persistence provider. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:element name="jar-file" type="xsd:string" + minOccurs="0" maxOccurs="unbounded"> + <xsd:annotation> + <xsd:documentation> + + Jar file that is to be scanned for managed classes. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:element name="class" type="xsd:string" + minOccurs="0" maxOccurs="unbounded"> + <xsd:annotation> + <xsd:documentation> + + Managed class to be included in the persistence unit and + to scan for annotations. It should be annotated + with either @Entity, @Embeddable or @MappedSuperclass. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:element name="exclude-unlisted-classes" type="xsd:boolean" + default="true" minOccurs="0"> + <xsd:annotation> + <xsd:documentation> + + When set to true then only listed classes and jars will + be scanned for persistent classes, otherwise the + enclosing jar or directory will also be scanned. + Not applicable to Java SE persistence units. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:element name="shared-cache-mode" + type="persistence:persistence-unit-caching-type" + minOccurs="0"> + <xsd:annotation> + <xsd:documentation> + + Defines whether caching is enabled for the + persistence unit if caching is supported by the + persistence provider. When set to ALL, all entities + will be cached. When set to NONE, no entities will + be cached. When set to ENABLE_SELECTIVE, only entities + specified as cacheable will be cached. When set to + DISABLE_SELECTIVE, entities specified as not cacheable + will not be cached. When not specified or when set to + UNSPECIFIED, provider defaults may apply. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:element name="validation-mode" + type="persistence:persistence-unit-validation-mode-type" + minOccurs="0"> + <xsd:annotation> + <xsd:documentation> + + The validation mode to be used for the persistence unit. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + + <!-- **************************************************** --> + + <xsd:element name="properties" minOccurs="0"> + <xsd:annotation> + <xsd:documentation> + + A list of standard and vendor-specific properties + and hints. + + </xsd:documentation> + </xsd:annotation> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="property" + minOccurs="0" maxOccurs="unbounded"> + <xsd:annotation> + <xsd:documentation> + A name-value pair. + </xsd:documentation> + </xsd:annotation> + <xsd:complexType> + <xsd:attribute name="name" type="xsd:string" + use="required"/> + <xsd:attribute name="value" type="xsd:string" + use="required"/> + </xsd:complexType> + </xsd:element> + </xsd:sequence> + </xsd:complexType> + </xsd:element> + + </xsd:sequence> + + <!-- **************************************************** --> + + <xsd:attribute name="name" type="xsd:string" use="required"> + <xsd:annotation> + <xsd:documentation> + + Name used in code to reference this persistence unit. + + </xsd:documentation> + </xsd:annotation> + </xsd:attribute> + + <!-- **************************************************** --> + + <xsd:attribute name="transaction-type" + type="persistence:persistence-unit-transaction-type"> + <xsd:annotation> + <xsd:documentation> + + Type of transactions used by EntityManagers from this + persistence unit. + + </xsd:documentation> + </xsd:annotation> + </xsd:attribute> + + </xsd:complexType> + </xsd:element> + </xsd:sequence> + <xsd:attribute name="version" type="persistence:versionType" + fixed="2.1" use="required"/> + </xsd:complexType> + </xsd:element> + + <!-- **************************************************** --> + + <xsd:simpleType name="persistence-unit-transaction-type"> + <xsd:annotation> + <xsd:documentation> + + public enum PersistenceUnitTransactionType {JTA, RESOURCE_LOCAL}; + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="JTA"/> + <xsd:enumeration value="RESOURCE_LOCAL"/> + </xsd:restriction> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:simpleType name="persistence-unit-caching-type"> + <xsd:annotation> + <xsd:documentation> + + public enum SharedCacheMode { ALL, NONE, ENABLE_SELECTIVE, DISABLE_SELECTIVE, UNSPECIFIED}; + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="ALL"/> + <xsd:enumeration value="NONE"/> + <xsd:enumeration value="ENABLE_SELECTIVE"/> + <xsd:enumeration value="DISABLE_SELECTIVE"/> + <xsd:enumeration value="UNSPECIFIED"/> + </xsd:restriction> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:simpleType name="persistence-unit-validation-mode-type"> + <xsd:annotation> + <xsd:documentation> + + public enum ValidationMode { AUTO, CALLBACK, NONE}; + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="AUTO"/> + <xsd:enumeration value="CALLBACK"/> + <xsd:enumeration value="NONE"/> + </xsd:restriction> + </xsd:simpleType> + +</xsd:schema> diff --git a/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/jpqleditor/JPQLEditorController.java b/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/jpqleditor/JPQLEditorController.java index cbbf278e9..c2b61dc92 100644 --- a/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/jpqleditor/JPQLEditorController.java +++ b/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/jpqleditor/JPQLEditorController.java @@ -1,43 +1,20 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the1 - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * Contributor(s): + * http://www.apache.org/licenses/LICENSE-2.0 * - * Portions Copyrighted 2008 Sun Microsystems, Inc. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.netbeans.modules.j2ee.persistence.jpqleditor; diff --git a/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/ui/resources/persistence-1.0.xml b/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/ui/resources/persistence-1.0.xml index f71245174..0f076909a 100644 --- a/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/ui/resources/persistence-1.0.xml +++ b/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/ui/resources/persistence-1.0.xml @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> - <persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" version="1.0"> - + </persistence> diff --git a/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/ui/resources/persistence-2.0.xml b/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/ui/resources/persistence-2.0.xml index 808d35803..e558de2b8 100644 --- a/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/ui/resources/persistence-2.0.xml +++ b/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/ui/resources/persistence-2.0.xml @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> - <persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" version="2.0"> - + </persistence> diff --git a/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/ui/resources/persistence-2.1.xml b/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/ui/resources/persistence-2.1.xml index 1069b3abf..2bf6f0705 100644 --- a/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/ui/resources/persistence-2.1.xml +++ b/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/ui/resources/persistence-2.1.xml @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> - <persistence xmlns="http://xmlns.jcp.org/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd" version="2.1"> - -</persistence> \ No newline at end of file + +</persistence> diff --git a/j2ee.persistence/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/persistence/action/AppMgdResTxInjEJBTest/testGenWithExistingEM.pass b/j2ee.persistence/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/persistence/action/AppMgdResTxInjEJBTest/testGenWithExistingEM.pass index 6687474f1..7d429184a 100644 --- a/j2ee.persistence/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/persistence/action/AppMgdResTxInjEJBTest/testGenWithExistingEM.pass +++ b/j2ee.persistence/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/persistence/action/AppMgdResTxInjEJBTest/testGenWithExistingEM.pass @@ -17,4 +17,4 @@ public class Test { myEm.getTransaction().rollback(); } } -} \ No newline at end of file +} diff --git a/j2ee.persistence/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/persistence/action/AppMgdResTxInjEJBTest/testGenerate.pass b/j2ee.persistence/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/persistence/action/AppMgdResTxInjEJBTest/testGenerate.pass index 49f3cc3cf..667a0973a 100644 --- a/j2ee.persistence/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/persistence/action/AppMgdResTxInjEJBTest/testGenerate.pass +++ b/j2ee.persistence/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/persistence/action/AppMgdResTxInjEJBTest/testGenerate.pass @@ -32,4 +32,4 @@ public class Test { em.getTransaction().rollback(); } } -} \ No newline at end of file +} diff --git a/j2ee.persistence/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/persistence/action/AppMgdResTxInjWebTest/testGenWithExistingEMF.pass b/j2ee.persistence/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/persistence/action/AppMgdResTxInjWebTest/testGenWithExistingEMF.pass index 49964b978..dc32fcb01 100644 --- a/j2ee.persistence/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/persistence/action/AppMgdResTxInjWebTest/testGenWithExistingEMF.pass +++ b/j2ee.persistence/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/persistence/action/AppMgdResTxInjWebTest/testGenWithExistingEMF.pass @@ -23,4 +23,4 @@ public class Test { em.close(); } } -} \ No newline at end of file +} diff --git a/j2ee.persistence/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/persistence/action/AppMgdResTxInjWebTest/testGenerate.pass b/j2ee.persistence/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/persistence/action/AppMgdResTxInjWebTest/testGenerate.pass index 680704943..1c547dc40 100644 --- a/j2ee.persistence/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/persistence/action/AppMgdResTxInjWebTest/testGenerate.pass +++ b/j2ee.persistence/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/persistence/action/AppMgdResTxInjWebTest/testGenerate.pass @@ -24,4 +24,4 @@ public class Test { em.close(); } } -} \ No newline at end of file +} diff --git a/j2ee.persistence/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/persistence/action/AppMgdResTxJ2SETest/testGenWithExistingEMF.pass b/j2ee.persistence/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/persistence/action/AppMgdResTxJ2SETest/testGenWithExistingEMF.pass index 1157a09dc..80e243dc2 100644 --- a/j2ee.persistence/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/persistence/action/AppMgdResTxJ2SETest/testGenWithExistingEMF.pass +++ b/j2ee.persistence/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/persistence/action/AppMgdResTxJ2SETest/testGenWithExistingEMF.pass @@ -21,4 +21,4 @@ public class Test { em.close(); } } -} \ No newline at end of file +} diff --git a/j2ee.persistence/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/persistence/action/AppMgdResTxJ2SETest/testGenerate.pass b/j2ee.persistence/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/persistence/action/AppMgdResTxJ2SETest/testGenerate.pass index 8a47526a7..5f826d95f 100644 --- a/j2ee.persistence/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/persistence/action/AppMgdResTxJ2SETest/testGenerate.pass +++ b/j2ee.persistence/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/persistence/action/AppMgdResTxJ2SETest/testGenerate.pass @@ -21,4 +21,4 @@ public class Test { em.close(); } } -} \ No newline at end of file +} diff --git a/j2ee.persistence/test/unit/data/invalid_persistence.xml b/j2ee.persistence/test/unit/data/invalid_persistence.xml index 2aa8cffb4..7f81b2030 100644 --- a/j2ee.persistence/test/unit/data/invalid_persistence.xml +++ b/j2ee.persistence/test/unit/data/invalid_persistence.xml @@ -1,6 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> -<persisten +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<persisten ce version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"> <persistence-unit name="JavaApplication10PU" transaction-type="RESOURCE_LOCAL"> diff --git a/j2ee.persistence/test/unit/data/persistence.xml b/j2ee.persistence/test/unit/data/persistence.xml index e3572737c..00f05fcdc 100644 --- a/j2ee.persistence/test/unit/data/persistence.xml +++ b/j2ee.persistence/test/unit/data/persistence.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <persistence xmlns="http://java.sun.com/xml/ns/persistence"> <persistence-unit name="em" transaction-type="JTA"> <jta-data-source>jdbc/__default</jta-data-source> diff --git a/j2ee.persistence/test/unit/src/org/netbeans/modules/j2ee/persistence/entitygenerator/Issue92031.dbschema b/j2ee.persistence/test/unit/src/org/netbeans/modules/j2ee/persistence/entitygenerator/Issue92031.dbschema index 7f9a408ae..d987f4a0c 100644 --- a/j2ee.persistence/test/unit/src/org/netbeans/modules/j2ee/persistence/entitygenerator/Issue92031.dbschema +++ b/j2ee.persistence/test/unit/src/org/netbeans/modules/j2ee/persistence/entitygenerator/Issue92031.dbschema @@ -1,5 +1,24 @@ <?xml version="1.0" encoding="UTF-8" ?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <OBJECT CLASS="com.sun.forte4j.modules.dbmodel.SchemaElement" ID="org.netbeans.modules.dbschema.SchemaElement-729775034"> <impl> <OBJECT CLASS="com.sun.forte4j.modules.dbmodel.jdbcimpl.SchemaElementImpl" ID="org.netbeans.modules.dbschema.jdbcimpl.SchemaElementImpl6016694"> diff --git a/j2ee.persistence/test/unit/src/org/netbeans/modules/j2ee/persistence/wizard/fromdb/sampledb.dbschema b/j2ee.persistence/test/unit/src/org/netbeans/modules/j2ee/persistence/wizard/fromdb/sampledb.dbschema index 1dc686863..47ba8aa5c 100644 --- a/j2ee.persistence/test/unit/src/org/netbeans/modules/j2ee/persistence/wizard/fromdb/sampledb.dbschema +++ b/j2ee.persistence/test/unit/src/org/netbeans/modules/j2ee/persistence/wizard/fromdb/sampledb.dbschema @@ -1,5 +1,24 @@ <?xml version="1.0" encoding="UTF-8" ?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <OBJECT CLASS="com.sun.forte4j.modules.dbmodel.SchemaElement" ID="org.netbeans.modules.dbschema.SchemaElement1975566248"> <impl> <OBJECT CLASS="com.sun.forte4j.modules.dbmodel.jdbcimpl.SchemaElementImpl" ID="org.netbeans.modules.dbschema.jdbcimpl.SchemaElementImpl5527342"> diff --git a/java.api.common/test/unit/src/org/netbeans/modules/java/api/common/queries/MultiModuleGroupQueryImplTest.java b/java.api.common/test/unit/src/org/netbeans/modules/java/api/common/queries/MultiModuleGroupQueryImplTest.java index eefb11303..2885eaeaf 100644 --- a/java.api.common/test/unit/src/org/netbeans/modules/java/api/common/queries/MultiModuleGroupQueryImplTest.java +++ b/java.api.common/test/unit/src/org/netbeans/modules/java/api/common/queries/MultiModuleGroupQueryImplTest.java @@ -1,3 +1,21 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.netbeans.modules.java.api.common.queries; import static junit.framework.TestCase.assertTrue; @@ -18,47 +36,6 @@ import org.openide.filesystems.FileUtil; import org.openide.util.test.MockLookup; -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2017 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2017 Sun Microsystems, Inc. - */ /** * diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/AdvancedMethodBody.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/AdvancedMethodBody.java index 5f6897145..fa182c684 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/AdvancedMethodBody.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/AdvancedMethodBody.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package test; public class Test { diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/CreateConstructorNonDefaultConstructor.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/CreateConstructorNonDefaultConstructor.java index 0cefc11c0..2f051e5d0 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/CreateConstructorNonDefaultConstructor.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/CreateConstructorNonDefaultConstructor.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package org.netbeans.modules.java.editor.completion.ElementCreatingJavaCompletionProviderTest; import java.util.HashMap; diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/CreateConstructorTest.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/CreateConstructorTest.java index 73ff1d24b..cc00663ee 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/CreateConstructorTest.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/CreateConstructorTest.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package test; import java.util.HashMap; diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/CreateConstructorWithConstructors.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/CreateConstructorWithConstructors.java index e073838fb..4f8368901 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/CreateConstructorWithConstructors.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/CreateConstructorWithConstructors.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package org.netbeans.modules.java.editor.completion.ElementCreatingJavaCompletionProviderTest; import java.util.HashMap; diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/CreateConstructorWithDefaultConstructor.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/CreateConstructorWithDefaultConstructor.java index 9d44ea381..3f25031e5 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/CreateConstructorWithDefaultConstructor.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/CreateConstructorWithDefaultConstructor.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package org.netbeans.modules.java.editor.completion.ElementCreatingJavaCompletionProviderTest; import java.util.HashMap; diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Empty.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Empty.java index e69de29bb..51da6c0f2 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Empty.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Empty.java @@ -0,0 +1,18 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Field.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Field.java index 08df4f372..6eefac6d9 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Field.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Field.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package test; public class Test { diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/FieldNoInit.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/FieldNoInit.java index c56d131f7..f253eb8ed 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/FieldNoInit.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/FieldNoInit.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package test; public class Test { diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/For.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/For.java index b653d3ce1..c5d7931ff 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/For.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/For.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package test; public class Test { diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/ForEach.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/ForEach.java index 5a813c5b5..637e7e864 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/ForEach.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/ForEach.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package test; public class Test { diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Generics.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Generics.java index 8d702999d..9269db24e 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Generics.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Generics.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package test; public class Test<X extends Number, Y extends RuntimeException> extends java.util.AbstractList<X> { diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsEmptyMethodBody.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsEmptyMethodBody.java index 16770126e..c997f9168 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsEmptyMethodBody.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsEmptyMethodBody.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package test; public class Test<X extends Number, Y extends RuntimeException> extends java.util.AbstractList<X> { diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsMethod.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsMethod.java index 9bff7e937..8764233c7 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsMethod.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsMethod.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package test; public class Test { diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsMethodBodyStart.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsMethodBodyStart.java index 9a8cedfae..d3f77e81e 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsMethodBodyStart.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsMethodBodyStart.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package test; public class Test<X extends Number, Y extends RuntimeException> extends java.util.AbstractList<X> { diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsMethodNoTypeParams.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsMethodNoTypeParams.java index 3153803b4..f5c3e7ddf 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsMethodNoTypeParams.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsMethodNoTypeParams.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package test; public class Test { diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsNoTypeParams.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsNoTypeParams.java index 748bfa03b..5cb8582c7 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsNoTypeParams.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsNoTypeParams.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package test; public class Test extends java.util.AbstractList { diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsStart.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsStart.java index 1980cfbc2..a9d864408 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsStart.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericsStart.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package test; public class Test diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Import.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Import.java index dec6c7649..7684030b5 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Import.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Import.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package test; import java.awt.List; diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Initializers.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Initializers.java index ade705dc0..85c5afb8b 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Initializers.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Initializers.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package test; public class Test { diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/InitializersStart.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/InitializersStart.java index cc0aa6d9b..2173c552f 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/InitializersStart.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/InitializersStart.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package test; public class Test { diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Interface.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Interface.java index 44382a148..d9a834e78 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Interface.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Interface.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package test; interface Test { diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/LambdaExpression.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/LambdaExpression.java index 18a137f8a..29daff8fc 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/LambdaExpression.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/LambdaExpression.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package test; public class Test { diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/LambdaExpressionEmptyMethodBody.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/LambdaExpressionEmptyMethodBody.java index e6c333b1e..f40e8ddf6 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/LambdaExpressionEmptyMethodBody.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/LambdaExpressionEmptyMethodBody.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package test; public class Test { diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/LambdaExpressionStart.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/LambdaExpressionStart.java index 4f90eca75..59584b44b 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/LambdaExpressionStart.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/LambdaExpressionStart.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package test; public class Test { diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Method.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Method.java index c9b8e5789..55e2b4b2d 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Method.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Method.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package test; public class Test { diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/MethodNoParamsAndThrows.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/MethodNoParamsAndThrows.java index b823f19df..106478bf4 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/MethodNoParamsAndThrows.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/MethodNoParamsAndThrows.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package test; public class Test { diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/MethodStart.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/MethodStart.java index 70a4d9c19..cceb3dd8c 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/MethodStart.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/MethodStart.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package test; public class Test { diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideAbstractList.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideAbstractList.java index c4ee6a423..020aa2315 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideAbstractList.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideAbstractList.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package test; import java.util.AbstractList; diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideAbstractList2.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideAbstractList2.java index 1b7fd3e51..46027d7ca 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideAbstractList2.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideAbstractList2.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package test; import java.util.AbstractList; diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideAbstractList3.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideAbstractList3.java index 4958ed559..3915326e8 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideAbstractList3.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideAbstractList3.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package test; import java.util.AbstractList; diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideAbstractListAbstract.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideAbstractListAbstract.java index 5028d5c7c..eeceda2dc 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideAbstractListAbstract.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideAbstractListAbstract.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package test; import java.util.AbstractList; diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideInInnerClass.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideInInnerClass.java index 7bbae012a..40ccd9142 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideInInnerClass.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideInInnerClass.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package test; import javax.swing.JFrame; diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideInInnerClassUnresolvable.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideInInnerClassUnresolvable.java index cb3291341..fd7297282 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideInInnerClassUnresolvable.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideInInnerClassUnresolvable.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package test; public class Test { diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverridePackagePrivateMethod.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverridePackagePrivateMethod.java index 9a6a56c52..0d929273d 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverridePackagePrivateMethod.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverridePackagePrivateMethod.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package test; import javax.swing.JFrame; diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverridePrivateMethod.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverridePrivateMethod.java index 09b29d2c8..720b74158 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverridePrivateMethod.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverridePrivateMethod.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package test; public class Test extends SecurityManager { diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideTypedException.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideTypedException.java index add2370b1..a9f1ed2d9 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideTypedException.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/OverrideTypedException.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package test; import java.io.IOException; diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Simple.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Simple.java index ba3e2362f..869cf92e4 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Simple.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Simple.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package test; public class Test extends Object implements Cloneable, Runnable { diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleEmptyMethodBody.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleEmptyMethodBody.java index 3ca41040d..7ebc28f17 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleEmptyMethodBody.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleEmptyMethodBody.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package test; public class Test { diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleEnum.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleEnum.java index 30896b736..b46d53218 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleEnum.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleEnum.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package test; public enum Test implements Cloneable { diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleEnumNoImplements.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleEnumNoImplements.java index 30896b736..b46d53218 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleEnumNoImplements.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleEnumNoImplements.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package test; public enum Test implements Cloneable { diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleInterface.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleInterface.java index a77d511ba..c0594a7a5 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleInterface.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleInterface.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package test; interface Test extends Cloneable { diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleInterfaceNoExtends.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleInterfaceNoExtends.java index eb3fa4329..f68931d9f 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleInterfaceNoExtends.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleInterfaceNoExtends.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package test; interface Test { diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleLambdaExpression.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleLambdaExpression.java index 083a6f495..2c6d78f5a 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleLambdaExpression.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleLambdaExpression.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package test; public class Test { diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleLambdaExpressionEmptyMethodBody.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleLambdaExpressionEmptyMethodBody.java index 8a201c7d9..c95f37095 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleLambdaExpressionEmptyMethodBody.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleLambdaExpressionEmptyMethodBody.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package test; public class Test { diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleLambdaExpressionStart.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleLambdaExpressionStart.java index ebb52c9fa..583767026 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleLambdaExpressionStart.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleLambdaExpressionStart.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package test; public class Test { diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleMethodBody.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleMethodBody.java index d48f950d1..c315ac18b 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleMethodBody.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleMethodBody.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package test; public class Test { diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleMethodBodyStart.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleMethodBodyStart.java index 127bd4125..5d10705b4 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleMethodBodyStart.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleMethodBodyStart.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package test; public class Test { diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleNoExtendsAndImplements.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleNoExtendsAndImplements.java index f732690bb..4c9785d7c 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleNoExtendsAndImplements.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleNoExtendsAndImplements.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package test; public class Test { diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleNoPackage.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleNoPackage.java index dd066b9bb..634247c40 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleNoPackage.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleNoPackage.java @@ -1,3 +1,21 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ public class Test { } diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleTWR.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleTWR.java index c060de7de..c9d24c6b6 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleTWR.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleTWR.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package test; import java.io.BufferedWriter; diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleTWRNoRes.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleTWRNoRes.java index c472ed921..e81df3b55 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleTWRNoRes.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleTWRNoRes.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package test; import java.io.BufferedWriter; diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleTWRStart.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleTWRStart.java index 40e639522..914c81cb2 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleTWRStart.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SimpleTWRStart.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package test; import java.io.BufferedWriter; diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Switch.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Switch.java index d6c51d862..ff86d68f0 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Switch.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Switch.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package test; public class Test { diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/TWR.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/TWR.java index 515e4e833..75f22f1b4 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/TWR.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/TWR.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package test; import java.io.File; diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/TWRNoRes.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/TWRNoRes.java index 153e3b943..bc78e04d0 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/TWRNoRes.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/TWRNoRes.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package test; import java.io.File; diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/TWRStart.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/TWRStart.java index 8a9fadd4c..96cbd5641 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/TWRStart.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/TWRStart.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package test; import java.io.File; diff --git a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/UnimplementedMethod.java b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/UnimplementedMethod.java index 4ce75901f..6e79e0d05 100644 --- a/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/UnimplementedMethod.java +++ b/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/UnimplementedMethod.java @@ -1,3 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package test; public class Test implements Runnable { diff --git a/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTask15FeaturesTest.java b/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTask15FeaturesTest.java index c93a198aa..afc422b4f 100644 --- a/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTask15FeaturesTest.java +++ b/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTask15FeaturesTest.java @@ -32,218 +32,218 @@ public JavaCompletionTask15FeaturesTest(String testName) { // Java 1.5 generics tests ------------------------------------------------------- public void testEmptyFileBeforeTypingFirstTypeParam() throws Exception { - performTest("GenericsStart", 32, "<", "empty.pass"); + performTest("GenericsStart", 842, "<", "empty.pass"); } public void testBeforeTypingFirstTypeParam() throws Exception { - performTest("GenericsNoTypeParams", 32, "<", "empty.pass"); + performTest("GenericsNoTypeParams", 842, "<", "empty.pass"); } public void testBeforeFirstTypeParam() throws Exception { - performTest("Generics", 33, null, "empty.pass"); + performTest("Generics", 843, null, "empty.pass"); } public void testEmptyFileTypingFirstTypeParam() throws Exception { - performTest("GenericsStart", 32, "<X", "empty.pass"); + performTest("GenericsStart", 842, "<X", "empty.pass"); } public void testTypingFirstTypeParam() throws Exception { - performTest("GenericsNoTypeParams", 32, "<X", "empty.pass"); + performTest("GenericsNoTypeParams", 842, "<X", "empty.pass"); } public void testOnFirstTypeParam() throws Exception { - performTest("Generics", 34, null, "empty.pass"); + performTest("Generics", 844, null, "empty.pass"); } public void testEmptyFileAfterTypingFirstTypeParamAndSpace() throws Exception { - performTest("GenericsStart", 32, "<X ", "extendsKeyword.pass"); + performTest("GenericsStart", 842, "<X ", "extendsKeyword.pass"); } public void testAfterTypingFirstTypeParamAndSpace() throws Exception { - performTest("GenericsNoTypeParams", 32, "<X ", "extendsKeyword.pass"); + performTest("GenericsNoTypeParams", 842, "<X ", "extendsKeyword.pass"); } public void testAfterFirstTypeParamAndSpace() throws Exception { - performTest("Generics", 35, null, "extendsKeyword.pass"); + performTest("Generics", 845, null, "extendsKeyword.pass"); } public void testEmptyFileTypingExtendsInFirstTypeParam() throws Exception { - performTest("GenericsStart", 32, "<X e", "extendsKeyword.pass"); + performTest("GenericsStart", 842, "<X e", "extendsKeyword.pass"); } public void testTypingExtendsInFirstTypeParam() throws Exception { - performTest("GenericsNoTypeParams", 32, "<X e", "extendsKeyword.pass"); + performTest("GenericsNoTypeParams", 842, "<X e", "extendsKeyword.pass"); } public void testOnExtendsInFirstTypeParam() throws Exception { - performTest("Generics", 36, null, "extendsKeyword.pass"); + performTest("Generics", 846, null, "extendsKeyword.pass"); } public void testEmptyFileAfterTypingExtendsInFirstTypeParam() throws Exception { - performTest("GenericsStart", 32, "<X extends", "extendsKeyword.pass"); + performTest("GenericsStart", 842, "<X extends", "extendsKeyword.pass"); } public void testAfterTypingExtendsInFirstTypeParam() throws Exception { - performTest("GenericsNoTypeParams", 32, "<X extends", "extendsKeyword.pass"); + performTest("GenericsNoTypeParams", 842, "<X extends", "extendsKeyword.pass"); } public void testAfterExtendsInFirstTypeParam() throws Exception { - performTest("Generics", 42, null, "extendsKeyword.pass"); + performTest("Generics", 852, null, "extendsKeyword.pass"); } public void testEmptyFileAfterTypingExtendsAndSpaceInFirstTypeParam() throws Exception { - performTest("GenericsStart", 32, "<X extends ", "javaLangContentAndTestClass.pass"); + performTest("GenericsStart", 842, "<X extends ", "javaLangContentAndTestClass.pass"); } public void testAfterTypingExtendsAndSpaceInFirstTypeParam() throws Exception { - performTest("GenericsNoTypeParams", 32, "<X extends ", "javaLangContentAndTestClass.pass"); + performTest("GenericsNoTypeParams", 842, "<X extends ", "javaLangContentAndTestClass.pass"); } public void testAfterExtendsAndSpaceInFirstTypeParam() throws Exception { - performTest("Generics", 43, null, "javaLangContentAndTestClass.pass"); + performTest("Generics", 853, null, "javaLangContentAndTestClass.pass"); } public void testEmptyFileAfterTypingBoundedFirstTypeParamAndSpace() throws Exception { - performTest("GenericsStart", 32, "<X extends Number ", "empty.pass"); + performTest("GenericsStart", 842, "<X extends Number ", "empty.pass"); } public void testAfterTypingBoundedFirstTypeParamAndSpace() throws Exception { - performTest("GenericsNoTypeParams", 32, "<X extends Number ", "empty.pass"); + performTest("GenericsNoTypeParams", 842, "<X extends Number ", "empty.pass"); } public void testAfterBoundedFirstTypeParamAndSpace() throws Exception { - performTest("Generics", 49, " ", "empty.pass"); + performTest("Generics", 859, " ", "empty.pass"); } public void testEmptyFileAfterTypingFirstTypeParam() throws Exception { - performTest("GenericsStart", 32, "<X extends Number,", "empty.pass"); + performTest("GenericsStart", 842, "<X extends Number,", "empty.pass"); } public void testAfterTypingFirstTypeParam() throws Exception { - performTest("GenericsNoTypeParams", 32, "<X extends Number,", "empty.pass"); + performTest("GenericsNoTypeParams", 842, "<X extends Number,", "empty.pass"); } public void testAfterFirstTypeParam() throws Exception { - performTest("Generics", 50, null, "empty.pass"); + performTest("Generics", 860, null, "empty.pass"); } public void testEmptyFileAfterTypingTypeParams() throws Exception { - performTest("GenericsStart", 32, "<X extends Number, Y extends RuntimeException>", "extendsAndImplementsKeywords.pass"); + performTest("GenericsStart", 842, "<X extends Number, Y extends RuntimeException>", "extendsAndImplementsKeywords.pass"); } public void testAfterTypingTypeParams() throws Exception { - performTest("GenericsNoTypeParams", 32, "<X extends Number, Y extends RuntimeException>", "extendsAndImplementsKeywords.pass"); + performTest("GenericsNoTypeParams", 842, "<X extends Number, Y extends RuntimeException>", "extendsAndImplementsKeywords.pass"); } public void testAfterTypeParams() throws Exception { - performTest("Generics", 78, null, "extendsAndImplementsKeywords.pass"); + performTest("Generics", 888, null, "extendsAndImplementsKeywords.pass"); } public void testEmptyFileBeforeTypingFirstMethodTypeParam() throws Exception { - performTest("MethodStart", 40, "public <", "empty.pass"); + performTest("MethodStart", 850, "public <", "empty.pass"); } public void testBeforeTypingFirstMethodTypeParam() throws Exception { - performTest("GenericsMethodNoTypeParams", 47, "<", "empty.pass"); + performTest("GenericsMethodNoTypeParams", 857, "<", "empty.pass"); } public void testBeforeFirstMethodTypeParam() throws Exception { - performTest("GenericsMethod", 48, null, "empty.pass"); + performTest("GenericsMethod", 858, null, "empty.pass"); } public void testEmptyFileTypingFirstMethodTypeParam() throws Exception { - performTest("MethodStart", 40, "public <X", "empty.pass"); + performTest("MethodStart", 850, "public <X", "empty.pass"); } public void testTypingFirstMethodTypeParam() throws Exception { - performTest("GenericsMethodNoTypeParams", 47, "<X", "empty.pass"); + performTest("GenericsMethodNoTypeParams", 857, "<X", "empty.pass"); } public void testOnFirstMethodTypeParam() throws Exception { - performTest("GenericsMethod", 49, null, "empty.pass"); + performTest("GenericsMethod", 859, null, "empty.pass"); } public void testEmptyFileAfterTypingFirstMethodTypeParamAndSpace() throws Exception { - performTest("MethodStart", 40, "public <X ", "extendsKeyword.pass"); + performTest("MethodStart", 850, "public <X ", "extendsKeyword.pass"); } public void testAfterTypingFirstMethodTypeParamAndSpace() throws Exception { - performTest("GenericsMethodNoTypeParams", 47, "<X ", "extendsKeyword.pass"); + performTest("GenericsMethodNoTypeParams", 857, "<X ", "extendsKeyword.pass"); } public void testAfterFirstMethodTypeParamAndSpace() throws Exception { - performTest("GenericsMethod", 50, null, "extendsKeyword.pass"); + performTest("GenericsMethod", 860, null, "extendsKeyword.pass"); } public void testEmptyFileTypingExtendsInFirstMethodTypeParam() throws Exception { - performTest("MethodStart", 40, "public <X e", "extendsKeyword.pass"); + performTest("MethodStart", 850, "public <X e", "extendsKeyword.pass"); } public void testTypingExtendsInFirstMethodTypeParam() throws Exception { - performTest("GenericsMethodNoTypeParams", 47, "<X e", "extendsKeyword.pass"); + performTest("GenericsMethodNoTypeParams", 857, "<X e", "extendsKeyword.pass"); } public void testOnExtendsInFirstMethodTypeParam() throws Exception { - performTest("GenericsMethod", 51, null, "extendsKeyword.pass"); + performTest("GenericsMethod", 861, null, "extendsKeyword.pass"); } public void testEmptyFileAfterTypingExtendsInFirstMethodTypeParam() throws Exception { - performTest("MethodStart", 40, "public <X extends", "extendsKeyword.pass"); + performTest("MethodStart", 850, "public <X extends", "extendsKeyword.pass"); } public void testAfterTypingExtendsInFirstMethodTypeParam() throws Exception { - performTest("GenericsMethodNoTypeParams", 47, "<X extends", "extendsKeyword.pass"); + performTest("GenericsMethodNoTypeParams", 857, "<X extends", "extendsKeyword.pass"); } public void testAfterExtendsInFirstMethodTypeParam() throws Exception { - performTest("GenericsMethod", 57, null, "extendsKeyword.pass"); + performTest("GenericsMethod", 867, null, "extendsKeyword.pass"); } public void testEmptyFileAfterTypingExtendsAndSpaceInFirstMethodTypeParam() throws Exception { - performTest("MethodStart", 40, "public <X extends ", "javaLangContentAndTestClass.pass"); + performTest("MethodStart", 850, "public <X extends ", "javaLangContentAndTestClass.pass"); } public void testAfterTypingExtendsAndSpaceInFirstMethodTypeParam() throws Exception { - performTest("GenericsMethodNoTypeParams", 47, "<X extends ", "javaLangContentAndTestClass.pass"); + performTest("GenericsMethodNoTypeParams", 857, "<X extends ", "javaLangContentAndTestClass.pass"); } public void testAfterExtendsAndSpaceInFirstMethodTypeParam() throws Exception { - performTest("GenericsMethod", 58, null, "javaLangContentAndTestClass.pass"); + performTest("GenericsMethod", 868, null, "javaLangContentAndTestClass.pass"); } public void testEmptyFileAfterTypingBoundedFirstMethodTypeParamAndSpace() throws Exception { - performTest("MethodStart", 40, "public <X extends Number ", "empty.pass"); + performTest("MethodStart", 850, "public <X extends Number ", "empty.pass"); } public void testAfterTypingBoundedFirstMethodTypeParamAndSpace() throws Exception { - performTest("GenericsMethodNoTypeParams", 47, "<X extends Number ", "empty.pass"); + performTest("GenericsMethodNoTypeParams", 857, "<X extends Number ", "empty.pass"); } public void testAfterBoundedFirstMethodTypeParamAndSpace() throws Exception { - performTest("Generics", 64, " ", "empty.pass"); + performTest("Generics", 874, " ", "empty.pass"); } public void testEmptyFileAfterTypingFirstMethodTypeParam() throws Exception { - performTest("MethodStart", 40, "public <X extends Number,", "empty.pass"); + performTest("MethodStart", 850, "public <X extends Number,", "empty.pass"); } public void testAfterTypingFirstMethodTypeParam() throws Exception { - performTest("GenericsMethodNoTypeParams", 47, "<X extends Number,", "empty.pass"); + performTest("GenericsMethodNoTypeParams", 857, "<X extends Number,", "empty.pass"); } public void testAfterFirstMethodTypeParam() throws Exception { - performTest("GenericsMethod", 65, null, "empty.pass"); + performTest("GenericsMethod", 875, null, "empty.pass"); } public void testEmptyFileAfterTypingMethodTypeParams() throws Exception { - performTest("MethodStart", 40, "public <X extends Number, Y extends RuntimeException>", "returnTypes.pass"); + performTest("MethodStart", 850, "public <X extends Number, Y extends RuntimeException>", "returnTypes.pass"); } public void testAfterTypingMethodTypeParams() throws Exception { - performTest("GenericsMethodNoTypeParams", 47, "<X extends Number, Y extends RuntimeException>", "returnTypes.pass"); + performTest("GenericsMethodNoTypeParams", 857, "<X extends Number, Y extends RuntimeException>", "returnTypes.pass"); } public void testAfterMethodTypeParams() throws Exception { - performTest("GenericsMethod", 93, null, "returnTypes.pass"); + performTest("GenericsMethod", 903, null, "returnTypes.pass"); } } diff --git a/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTask17FeaturesTest.java b/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTask17FeaturesTest.java index a8eed7006..0c85835a2 100644 --- a/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTask17FeaturesTest.java +++ b/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTask17FeaturesTest.java @@ -33,87 +33,87 @@ public JavaCompletionTask17FeaturesTest(String testName) { // Java 1.7 try-with-resources tests --------------------------------------- public void testEmptyFileBeforeTypingVarResouce() throws Exception { - performTest("TWRStart", 114, "try (", "finalAndAutoCloseables.pass", "1.7"); + performTest("TWRStart", 924, "try (", "finalAndAutoCloseables.pass", "1.7"); } public void testBeforeTypingVarResouce() throws Exception { - performTest("TWRNoRes", 127, null, "finalAndAutoCloseables.pass", "1.7"); + performTest("TWRNoRes", 937, null, "finalAndAutoCloseables.pass", "1.7"); } public void testBeforeVarResouce() throws Exception { - performTest("TWR", 127, null, "finalAndAutoCloseables.pass", "1.7"); + performTest("TWR", 937, null, "finalAndAutoCloseables.pass", "1.7"); } public void testEmptyFileTypingVarResouce() throws Exception { - performTest("TWRStart", 114, "try (f", "finalKeyword.pass", "1.7"); + performTest("TWRStart", 924, "try (f", "finalKeyword.pass", "1.7"); } public void testTypingVarResouce() throws Exception { - performTest("TWRNoRes", 127, "f", "finalKeyword.pass", "1.7"); + performTest("TWRNoRes", 937, "f", "finalKeyword.pass", "1.7"); } public void testOnVarResouce() throws Exception { - performTest("TWR", 128, null, "finalKeyword.pass", "1.7"); + performTest("TWR", 938, null, "finalKeyword.pass", "1.7"); } public void testEmptyFileAfterFinalInResource() throws Exception { - performTest("TWRStart", 114, "try (final ", "autoCloseables.pass", "1.7"); + performTest("TWRStart", 924, "try (final ", "autoCloseables.pass", "1.7"); } public void testTypingAfterFinalInResouce() throws Exception { - performTest("TWRNoRes", 127, "final ", "autoCloseables.pass", "1.7"); + performTest("TWRNoRes", 937, "final ", "autoCloseables.pass", "1.7"); } public void testAfterFinalInResouce() throws Exception { - performTest("TWR", 133, null, "autoCloseables.pass", "1.7"); + performTest("TWR", 943, null, "autoCloseables.pass", "1.7"); } public void testEmptyFileTypingTypeInVarResouce() throws Exception { - performTest("TWRStart", 114, "try (final F", "autoCloseablesStartingWithF.pass", "1.7"); + performTest("TWRStart", 924, "try (final F", "autoCloseablesStartingWithF.pass", "1.7"); } public void testTypingTypeInVarResouce() throws Exception { - performTest("TWRNoRes", 127, "final F", "autoCloseablesStartingWithF.pass", "1.7"); + performTest("TWRNoRes", 937, "final F", "autoCloseablesStartingWithF.pass", "1.7"); } public void testOnTypeInVarResouce() throws Exception { - performTest("TWR", 134, null, "autoCloseablesStartingWithF.pass", "1.7"); + performTest("TWR", 944, null, "autoCloseablesStartingWithF.pass", "1.7"); } public void testEmptyFileBeforeTypingNameInVarResouce() throws Exception { - performTest("TWRStart", 114, "try (final FileWriter ", "resourceNames.pass", "1.7"); + performTest("TWRStart", 924, "try (final FileWriter ", "resourceNames.pass", "1.7"); } public void testBeforeTypingNameInVarResouce() throws Exception { - performTest("TWRNoRes", 127, "final FileWriter ", "resourceNames.pass", "1.7"); + performTest("TWRNoRes", 937, "final FileWriter ", "resourceNames.pass", "1.7"); } public void testBeforeNameInVarResouce() throws Exception { - performTest("TWR", 144, null, "resourceNames.pass", "1.7"); + performTest("TWR", 954, null, "resourceNames.pass", "1.7"); } public void testEmptyFileAfterTypingNameInVarResouce() throws Exception { - performTest("TWRStart", 114, "try (final FileWriter fw ", "empty.pass", "1.7"); + performTest("TWRStart", 924, "try (final FileWriter fw ", "empty.pass", "1.7"); } public void testAfterTypingNameInVarResouce() throws Exception { - performTest("TWRNoRes", 127, "final FileWriter fw ", "empty.pass", "1.7"); + performTest("TWRNoRes", 937, "final FileWriter fw ", "empty.pass", "1.7"); } public void testAfterNameInVarResouce() throws Exception { - performTest("TWR", 147, null, "empty.pass", "1.7"); + performTest("TWR", 957, null, "empty.pass", "1.7"); } public void testEmptyFileBeforeVarResouceInit() throws Exception { - performTest("TWRStart", 114, "try (final FileWriter fw = ", "resourceInit.pass", "1.7"); + performTest("TWRStart", 924, "try (final FileWriter fw = ", "resourceInit.pass", "1.7"); } public void testBeforeTypingVarResouceInit() throws Exception { - performTest("TWRNoRes", 127, "final FileWriter fw = ", "resourceInit.pass", "1.7"); + performTest("TWRNoRes", 937, "final FileWriter fw = ", "resourceInit.pass", "1.7"); } public void testBeforeVarResouceInit() throws Exception { - performTest("TWR", 149, null, "resourceInit.pass", "1.7"); + performTest("TWR", 959, null, "resourceInit.pass", "1.7"); } static { diff --git a/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTask18FeaturesTest.java b/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTask18FeaturesTest.java index c8f61800e..516ca8c84 100644 --- a/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTask18FeaturesTest.java +++ b/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTask18FeaturesTest.java @@ -33,305 +33,305 @@ public JavaCompletionTask18FeaturesTest(String testName) { // Java 1.8 default method tests ------------------------------------------- public void testEmptyFileBeforeTypingDefaultModifier() throws Exception { - performTest("Empty", 0, "package test;\ninterface Test {", "interfaceMemberModifiersAndTypes.pass", "1.8"); + performTest("Empty", 809, "package test;\ninterface Test {", "interfaceMemberModifiersAndTypes.pass", "1.8"); } public void testBeforeTypingDefaultModifier() throws Exception { - performTest("SimpleInterfaceNoExtends", 31, null, "interfaceMemberModifiersAndTypes.pass", "1.8"); + performTest("SimpleInterfaceNoExtends", 841, null, "interfaceMemberModifiersAndTypes.pass", "1.8"); } public void testBeforeDefaultModifier() throws Exception { - performTest("Interface", 37, null, "interfaceMemberModifiersAndTypes.pass", "1.8"); + performTest("Interface", 847, null, "interfaceMemberModifiersAndTypes.pass", "1.8"); } public void testEmptyFileTypingDefaultModifier() throws Exception { - performTest("Empty", 0, "package test;\ninterface Test {\nde", "defaultKeyword.pass", "1.8"); + performTest("Empty", 809, "package test;\ninterface Test {\nde", "defaultKeyword.pass", "1.8"); } public void testTypingDefaultModifier() throws Exception { - performTest("SimpleInterfaceNoExtends", 31, "\nde", "defaultKeyword.pass", "1.8"); + performTest("SimpleInterfaceNoExtends", 841, "\nde", "defaultKeyword.pass", "1.8"); } public void testOnDefaultModifier() throws Exception { - performTest("Interface", 39, null, "defaultKeyword.pass", "1.8"); + performTest("Interface", 849, null, "defaultKeyword.pass", "1.8"); } public void testEmptyFileAfterTypingDefaultModifier() throws Exception { - performTest("Empty", 0, "package test;\ninterface Test {\ndefault ", "interfaceMemberModifiersAndTypesWithoutDefaultAbstractAndStatic.pass", "1.8"); + performTest("Empty", 809, "package test;\ninterface Test {\ndefault ", "interfaceMemberModifiersAndTypesWithoutDefaultAbstractAndStatic.pass", "1.8"); } public void testAfterTypingDefaultModifier() throws Exception { - performTest("SimpleInterfaceNoExtends", 31, "\ndefault ", "interfaceMemberModifiersAndTypesWithoutDefaultAbstractAndStatic.pass", "1.8"); + performTest("SimpleInterfaceNoExtends", 841, "\ndefault ", "interfaceMemberModifiersAndTypesWithoutDefaultAbstractAndStatic.pass", "1.8"); } public void testAfterDefaultModifier() throws Exception { - performTest("Interface", 45, null, "interfaceMemberModifiersAndTypesWithoutDefaultAbstractAndStatic.pass", "1.8"); + performTest("Interface", 855, null, "interfaceMemberModifiersAndTypesWithoutDefaultAbstractAndStatic.pass", "1.8"); } public void testEmptyFileAfterTypingStaticModifier() throws Exception { - performTest("Empty", 0, "package test;\ninterface Test {\nstatic ", "memberModifiersAndTypesWithoutStatic.pass", "1.8"); + performTest("Empty", 809, "package test;\ninterface Test {\nstatic ", "memberModifiersAndTypesWithoutStatic.pass", "1.8"); } public void testAfterTypingStaticModifier() throws Exception { - performTest("SimpleInterfaceNoExtends", 31, "\nstatic ", "memberModifiersAndTypesWithoutStatic.pass", "1.8"); + performTest("SimpleInterfaceNoExtends", 841, "\nstatic ", "memberModifiersAndTypesWithoutStatic.pass", "1.8"); } public void testAfterStaticModifier() throws Exception { - performTest("Interface", 102, null, "memberModifiersAndTypesWithoutStatic.pass", "1.8"); + performTest("Interface", 912, null, "memberModifiersAndTypesWithoutStatic.pass", "1.8"); } public void testEmptyFileTypingDefaultMethodBody() throws Exception { - performTest("Empty", 0, "package test;\ninterface Test {\ndefault String name() {", "typesInterfaceMembersAndVars1.pass", "1.8"); + performTest("Empty", 809, "package test;\ninterface Test {\ndefault String name() {", "typesInterfaceMembersAndVars1.pass", "1.8"); } public void testTypingDefaultMethodBody() throws Exception { - performTest("SimpleInterfaceNoExtends", 31, "\ndefault String name() {", "typesInterfaceMembersAndVars1.pass", "1.8"); + performTest("SimpleInterfaceNoExtends", 841, "\ndefault String name() {", "typesInterfaceMembersAndVars1.pass", "1.8"); } public void testInsideDefaultMethodBody() throws Exception { - performTest("Interface", 69, null, "typesInterfaceMembersAndVars.pass", "1.8"); + performTest("Interface", 879, null, "typesInterfaceMembersAndVars.pass", "1.8"); } public void testEmptyFileTypingStaticMethodBody() throws Exception { - performTest("Empty", 0, "package test;\ninterface Test {\nstatic int length(String s) {", "typesStaticInterfaceMembersAndVars.pass", "1.8"); + performTest("Empty", 809, "package test;\ninterface Test {\nstatic int length(String s) {", "typesStaticInterfaceMembersAndVars.pass", "1.8"); } public void testTypingStaticMethodBody() throws Exception { - performTest("SimpleInterfaceNoExtends", 31, "\nstatic int length(String s) {", "typesStaticInterfaceMembersAndVars.pass", "1.8"); + performTest("SimpleInterfaceNoExtends", 841, "\nstatic int length(String s) {", "typesStaticInterfaceMembersAndVars.pass", "1.8"); } public void testInsideStaticMethodBody() throws Exception { - performTest("Interface", 133, null, "typesStaticInterfaceMembersAndVars.pass", "1.8"); + performTest("Interface", 943, null, "typesStaticInterfaceMembersAndVars.pass", "1.8"); } // Java 1.8 lambda expressions tests --------------------------------------- public void testEmptyFileAfterTypingLambdaParam() throws Exception { - performTest("SimpleLambdaExpressionStart", 195, "t.test(s ", "empty.pass", "1.8"); + performTest("SimpleLambdaExpressionStart", 1005, "t.test(s ", "empty.pass", "1.8"); } public void testAfterTypingLambdaParam() throws Exception { - performTest("SimpleLambdaExpressionEmptyMethodBody", 195, "t.test(s ", "empty.pass", "1.8"); + performTest("SimpleLambdaExpressionEmptyMethodBody", 1005, "t.test(s ", "empty.pass", "1.8"); } public void testAfterLambdaParam() throws Exception { - performTest("SimpleLambdaExpression", 205, null, "empty.pass", "1.8"); + performTest("SimpleLambdaExpression", 1015, null, "empty.pass", "1.8"); } public void testEmptyFileAfterTypingTypeOfLambdaParam() throws Exception { - performTest("SimpleLambdaExpressionStart", 195, "t.test((String ", "stringVarName.pass", "1.8"); + performTest("SimpleLambdaExpressionStart", 1005, "t.test((String ", "stringVarName.pass", "1.8"); } public void testAfterTypingTypeOfLambdaParam() throws Exception { - performTest("SimpleLambdaExpressionEmptyMethodBody", 195, "t.test((String ", "stringVarName.pass", "1.8"); + performTest("SimpleLambdaExpressionEmptyMethodBody", 1005, "t.test((String ", "stringVarName.pass", "1.8"); } public void testAfterTypeOfLambdaParam() throws Exception { - performTest("SimpleLambdaExpression", 265, null, "stringVarName.pass", "1.8"); + performTest("SimpleLambdaExpression", 1075, null, "stringVarName.pass", "1.8"); } public void testEmptyFileAfterTypingTypedLambdaParam() throws Exception { - performTest("SimpleLambdaExpressionStart", 195, "t.test((String s ", "empty.pass", "1.8"); + performTest("SimpleLambdaExpressionStart", 1005, "t.test((String s ", "empty.pass", "1.8"); } public void testAfterTypingTypedLambdaParam() throws Exception { - performTest("SimpleLambdaExpressionEmptyMethodBody", 195, "t.test((String s ", "empty.pass", "1.8"); + performTest("SimpleLambdaExpressionEmptyMethodBody", 1005, "t.test((String s ", "empty.pass", "1.8"); } public void testAfterTypedLambdaParam() throws Exception { - performTest("SimpleLambdaExpression", 266, " ", "empty.pass", "1.8"); + performTest("SimpleLambdaExpression", 1076, " ", "empty.pass", "1.8"); } public void testEmptyFileTypingSecondLambdaParam() throws Exception { - performTest("SimpleLambdaExpressionStart", 195, "t.test((s,", "empty.pass", "1.8"); + performTest("SimpleLambdaExpressionStart", 1005, "t.test((s,", "empty.pass", "1.8"); } public void testTypingSecondLambdaParam() throws Exception { - performTest("SimpleLambdaExpressionEmptyMethodBody", 195, "t.test((s,", "empty.pass", "1.8"); + performTest("SimpleLambdaExpressionEmptyMethodBody", 1005, "t.test((s,", "empty.pass", "1.8"); } public void testBeforeSecondLambdaParam() throws Exception { - performTest("SimpleLambdaExpression", 231, ",", "empty.pass", "1.8"); + performTest("SimpleLambdaExpression", 1041, ",", "empty.pass", "1.8"); } public void testEmptyFileTypingSecondTypedLambdaParam() throws Exception { - performTest("SimpleLambdaExpressionStart", 195, "t.test((String s,", "lambdaParameterTypes.pass", "1.8"); + performTest("SimpleLambdaExpressionStart", 1005, "t.test((String s,", "lambdaParameterTypes.pass", "1.8"); } public void testTypingSecondTypedLambdaParam() throws Exception { - performTest("SimpleLambdaExpressionEmptyMethodBody", 195, "t.test((String s,", "lambdaParameterTypes.pass", "1.8"); + performTest("SimpleLambdaExpressionEmptyMethodBody", 1005, "t.test((String s,", "lambdaParameterTypes.pass", "1.8"); } public void testBeforeSecondTypedLambdaParam() throws Exception { - performTest("SimpleLambdaExpression", 266, ",", "lambdaParameterTypes.pass", "1.8"); + performTest("SimpleLambdaExpression", 1076, ",", "lambdaParameterTypes.pass", "1.8"); } public void testEmptyFileAfterTypingTypedLambdaParams() throws Exception { - performTest("SimpleLambdaExpressionStart", 195, "t.test((String s)", "empty.pass", "1.8"); + performTest("SimpleLambdaExpressionStart", 1005, "t.test((String s)", "empty.pass", "1.8"); } public void testAfterTypingTypedLambdaParams() throws Exception { - performTest("SimpleLambdaExpressionEmptyMethodBody", 195, "t.test((String s)", "empty.pass", "1.8"); + performTest("SimpleLambdaExpressionEmptyMethodBody", 1005, "t.test((String s)", "empty.pass", "1.8"); } public void testAfterTypedLambdaParams() throws Exception { - performTest("SimpleLambdaExpression", 267, null, "empty.pass", "1.8"); + performTest("SimpleLambdaExpression", 1077, null, "empty.pass", "1.8"); } public void testEmptyFileAfterTypingTypedLambdaParamsAndSpace() throws Exception { - performTest("SimpleLambdaExpressionStart", 195, "t.test((String s) ", "empty.pass", "1.8"); + performTest("SimpleLambdaExpressionStart", 1005, "t.test((String s) ", "empty.pass", "1.8"); } public void testAfterTypingTypedLambdaParamsAndSpace() throws Exception { - performTest("SimpleLambdaExpressionEmptyMethodBody", 195, "t.test((String s) ", "empty.pass", "1.8"); + performTest("SimpleLambdaExpressionEmptyMethodBody", 1005, "t.test((String s) ", "empty.pass", "1.8"); } public void testAfterTypedLambdaParamsAndSpace() throws Exception { - performTest("SimpleLambdaExpression", 268, null, "empty.pass", "1.8"); + performTest("SimpleLambdaExpression", 1078, null, "empty.pass", "1.8"); } public void testEmptyFileAfterTypingLambdaArrow() throws Exception { - performTest("SimpleLambdaExpressionStart", 195, "t.test(s ->", "lambdaSmartInt.pass", "1.8"); + performTest("SimpleLambdaExpressionStart", 1005, "t.test(s ->", "lambdaSmartInt.pass", "1.8"); } public void testAfterTypingLambdaArrow() throws Exception { - performTest("SimpleLambdaExpressionEmptyMethodBody", 195, "t.test(s ->", "lambdaSmartInt.pass", "1.8"); + performTest("SimpleLambdaExpressionEmptyMethodBody", 1005, "t.test(s ->", "lambdaSmartInt.pass", "1.8"); } public void testAfterLambdaArrow() throws Exception { - performTest("SimpleLambdaExpression", 207, null, "lambdaSmartInt.pass", "1.8"); + performTest("SimpleLambdaExpression", 1017, null, "lambdaSmartInt.pass", "1.8"); } public void testEmptyFileAfterTypingTypedLambdaArrow() throws Exception { - performTest("SimpleLambdaExpressionStart", 195, "t.test((String s) ->", "lambdaSmartInt.pass", "1.8"); + performTest("SimpleLambdaExpressionStart", 1005, "t.test((String s) ->", "lambdaSmartInt.pass", "1.8"); } public void testAfterTypingTypedLambdaArrow() throws Exception { - performTest("SimpleLambdaExpressionEmptyMethodBody", 195, "t.test((String s) ->", "lambdaSmartInt.pass", "1.8"); + performTest("SimpleLambdaExpressionEmptyMethodBody", 1005, "t.test((String s) ->", "lambdaSmartInt.pass", "1.8"); } public void testAfterTypedLambdaArrow() throws Exception { - performTest("SimpleLambdaExpression", 270, null, "lambdaSmartInt.pass", "1.8"); + performTest("SimpleLambdaExpression", 1080, null, "lambdaSmartInt.pass", "1.8"); } public void testEmptyFileAfterTypingLambdaArrowAndSpace() throws Exception { - performTest("SimpleLambdaExpressionStart", 195, "t.test(s -> ", "lambdaSmartInt.pass", "1.8"); + performTest("SimpleLambdaExpressionStart", 1005, "t.test(s -> ", "lambdaSmartInt.pass", "1.8"); } public void testAfterTypingLambdaArrowAndSpace() throws Exception { - performTest("SimpleLambdaExpressionEmptyMethodBody", 195, "t.test(s -> ", "lambdaSmartInt.pass", "1.8"); + performTest("SimpleLambdaExpressionEmptyMethodBody", 1005, "t.test(s -> ", "lambdaSmartInt.pass", "1.8"); } public void testAfterLambdaArrowAndSpace() throws Exception { - performTest("SimpleLambdaExpression", 208, null, "lambdaSmartInt.pass", "1.8"); + performTest("SimpleLambdaExpression", 1018, null, "lambdaSmartInt.pass", "1.8"); } public void testEmptyFileAfterTypingTypedLambdaArrowAndSpace() throws Exception { - performTest("SimpleLambdaExpressionStart", 195, "t.test((String s) -> ", "lambdaSmartInt.pass", "1.8"); + performTest("SimpleLambdaExpressionStart", 1005, "t.test((String s) -> ", "lambdaSmartInt.pass", "1.8"); } public void testAfterTypingTypedLambdaArrowAndSpace() throws Exception { - performTest("SimpleLambdaExpressionEmptyMethodBody", 195, "t.test((String s) -> ", "lambdaSmartInt.pass", "1.8"); + performTest("SimpleLambdaExpressionEmptyMethodBody", 1005, "t.test((String s) -> ", "lambdaSmartInt.pass", "1.8"); } public void testAfterTypedLambdaArrowAndSpace() throws Exception { - performTest("SimpleLambdaExpression", 271, null, "lambdaSmartInt.pass", "1.8"); + performTest("SimpleLambdaExpression", 1081, null, "lambdaSmartInt.pass", "1.8"); } public void testEmptyFileAfterTypingLambdaExpression() throws Exception { - performTest("SimpleLambdaExpressionStart", 195, "t.test(s -> s.length()", "empty.pass", "1.8"); + performTest("SimpleLambdaExpressionStart", 1005, "t.test(s -> s.length()", "empty.pass", "1.8"); } public void testAfterTypingLambdaExpression() throws Exception { - performTest("SimpleLambdaExpressionEmptyMethodBody", 195, "t.test(s -> s.length()", "empty.pass", "1.8"); + performTest("SimpleLambdaExpressionEmptyMethodBody", 1005, "t.test(s -> s.length()", "empty.pass", "1.8"); } public void testAfterLambdaExpression() throws Exception { - performTest("SimpleLambdaExpression", 218, null, "empty.pass", "1.8"); + performTest("SimpleLambdaExpression", 1028, null, "empty.pass", "1.8"); } public void testEmptyFileTypingLambdaBlock() throws Exception { - performTest("SimpleLambdaExpressionStart", 195, "t.test(s -> {", "lambdaBodyContent.pass", "1.8"); + performTest("SimpleLambdaExpressionStart", 1005, "t.test(s -> {", "lambdaBodyContent.pass", "1.8"); } public void testTypingLambdaBlock() throws Exception { - performTest("SimpleLambdaExpressionEmptyMethodBody", 195, "t.test(s -> {", "lambdaBodyContent.pass", "1.8"); + performTest("SimpleLambdaExpressionEmptyMethodBody", 1005, "t.test(s -> {", "lambdaBodyContent.pass", "1.8"); } public void testInsideOfLambdaBlock() throws Exception { - performTest("SimpleLambdaExpression", 308, null, "lambdaBodyContent.pass", "1.8"); + performTest("SimpleLambdaExpression", 1118, null, "lambdaBodyContent.pass", "1.8"); } public void testEmptyFileTypingTypedLambdaBlock() throws Exception { - performTest("SimpleLambdaExpressionStart", 195, "t.test((String s) -> {", "lambdaBodyContent.pass", "1.8"); + performTest("SimpleLambdaExpressionStart", 1005, "t.test((String s) -> {", "lambdaBodyContent.pass", "1.8"); } public void testTypingTypedLambdaBlock() throws Exception { - performTest("SimpleLambdaExpressionEmptyMethodBody", 195, "t.test((String s) -> {", "lambdaBodyContent.pass", "1.8"); + performTest("SimpleLambdaExpressionEmptyMethodBody", 1005, "t.test((String s) -> {", "lambdaBodyContent.pass", "1.8"); } public void testInsideOfTypedLambdaBlock() throws Exception { - performTest("SimpleLambdaExpression", 272, null, "lambdaBodyContent.pass", "1.8"); + performTest("SimpleLambdaExpression", 1082, null, "lambdaBodyContent.pass", "1.8"); } public void testEmptyFileAfterLocalVarInLambdaBlock() throws Exception { - performTest("SimpleLambdaExpressionStart", 195, "t.test(s -> {int i; ", "lambdaBodyContentWithLocalVar.pass", "1.8"); + performTest("SimpleLambdaExpressionStart", 1005, "t.test(s -> {int i; ", "lambdaBodyContentWithLocalVar.pass", "1.8"); } public void testTypingAfterLocalVarInLambdaBlock() throws Exception { - performTest("SimpleLambdaExpressionEmptyMethodBody", 195, "t.test(s -> {int i; ", "lambdaBodyContentWithLocalVar.pass", "1.8"); + performTest("SimpleLambdaExpressionEmptyMethodBody", 1005, "t.test(s -> {int i; ", "lambdaBodyContentWithLocalVar.pass", "1.8"); } public void testAfterLocalVarInLambdaBlock() throws Exception { - performTest("SimpleLambdaExpression", 272, "int i; ", "lambdaBodyContentWithLocalVar.pass", "1.8"); + performTest("SimpleLambdaExpression", 1082, "int i; ", "lambdaBodyContentWithLocalVar.pass", "1.8"); } public void testEmptyFileTypingReturnFromLambdaBlock() throws Exception { - performTest("SimpleLambdaExpressionStart", 195, "t.test(s -> {return ", "lambdaSmartInt.pass", "1.8"); + performTest("SimpleLambdaExpressionStart", 1005, "t.test(s -> {return ", "lambdaSmartInt.pass", "1.8"); } public void testTypingReturnFromLambdaBlock() throws Exception { - performTest("SimpleLambdaExpressionEmptyMethodBody", 195, "t.test(s -> {return ", "lambdaSmartInt.pass", "1.8"); + performTest("SimpleLambdaExpressionEmptyMethodBody", 1005, "t.test(s -> {return ", "lambdaSmartInt.pass", "1.8"); } public void testAfterReturnFromLambdaBlock() throws Exception { - performTest("SimpleLambdaExpression", 315, null, "lambdaSmartInt.pass", "1.8"); + performTest("SimpleLambdaExpression", 1125, null, "lambdaSmartInt.pass", "1.8"); } public void testEmptyFileTypingReturnFromTypedLambdaBlock() throws Exception { - performTest("SimpleLambdaExpressionStart", 195, "t.test((String s) -> {return ", "lambdaSmartInt.pass", "1.8"); + performTest("SimpleLambdaExpressionStart", 1005, "t.test((String s) -> {return ", "lambdaSmartInt.pass", "1.8"); } public void testTypingReturnFromTypedLambdaBlock() throws Exception { - performTest("SimpleLambdaExpressionEmptyMethodBody", 195, "t.test((String s) -> {return ", "lambdaSmartInt.pass", "1.8"); + performTest("SimpleLambdaExpressionEmptyMethodBody", 1005, "t.test((String s) -> {return ", "lambdaSmartInt.pass", "1.8"); } public void testAfterReturnFromTypedLambdaBlock() throws Exception { - performTest("SimpleLambdaExpression", 279, null, "lambdaSmartInt.pass", "1.8"); + performTest("SimpleLambdaExpression", 1089, null, "lambdaSmartInt.pass", "1.8"); } public void testMoreCandidatesEmptyFileAfterTypingLambdaArrow() throws Exception { - performTest("LambdaExpressionStart", 293, "t.test(s ->", "lambdaExpression.pass", "1.8"); + performTest("LambdaExpressionStart", 1103, "t.test(s ->", "lambdaExpression.pass", "1.8"); } public void testMoreCandidatesAfterTypingLambdaArrow() throws Exception { - performTest("LambdaExpressionEmptyMethodBody", 293, "t.test(s ->", "lambdaExpression.pass", "1.8"); + performTest("LambdaExpressionEmptyMethodBody", 1103, "t.test(s ->", "lambdaExpression.pass", "1.8"); } public void testMoreCandidatesAfterLambdaArrow() throws Exception { - performTest("LambdaExpression", 313, null, "lambdaSmartInt2.pass", "1.8"); + performTest("LambdaExpression", 1123, null, "lambdaSmartInt2.pass", "1.8"); } public void testMoreCandidatesEmptyFileTypingReturnFromLambdaBlock() throws Exception { - performTest("LambdaExpressionStart", 293, "t.test(s -> {return ", "lambdaExpression.pass", "1.8"); + performTest("LambdaExpressionStart", 1103, "t.test(s -> {return ", "lambdaExpression.pass", "1.8"); } public void testMoreCandidatesTypingReturnFromLambdaBlock() throws Exception { - performTest("LambdaExpressionEmptyMethodBody", 293, "t.test(s -> {return ", "lambdaExpression.pass", "1.8"); + performTest("LambdaExpressionEmptyMethodBody", 1103, "t.test(s -> {return ", "lambdaExpression.pass", "1.8"); } public void testMoreCandidatesAfterReturnFromLambdaBlock() throws Exception { - performTest("LambdaExpression", 350, null, "lambdaSmartInt2.pass", "1.8"); + performTest("LambdaExpression", 1160, null, "lambdaSmartInt2.pass", "1.8"); } static { diff --git a/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTask19FeaturesTest.java b/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTask19FeaturesTest.java index 319022406..a8ed34e6e 100644 --- a/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTask19FeaturesTest.java +++ b/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTask19FeaturesTest.java @@ -33,51 +33,51 @@ public JavaCompletionTask19FeaturesTest(String testName) { // Java 1.9 try-with-resources tests ------------------------------------------- public void testEmptyFileBeforeTypingExistingVarResouce() throws Exception { - performTest("SimpleTWRStart", 139, "try (", "resourcesAndAutoCloseables.pass", "1.9"); + performTest("SimpleTWRStart", 949, "try (", "resourcesAndAutoCloseables.pass", "1.9"); } public void testBeforeTypingExistingVarResouce() throws Exception { - performTest("SimpleTWRNoRes", 144, null, "resourcesAndAutoCloseables.pass", "1.9"); + performTest("SimpleTWRNoRes", 954, null, "resourcesAndAutoCloseables.pass", "1.9"); } public void testBeforeExistingVarResouce() throws Exception { - performTest("SimpleTWR", 172, null, "resourcesAndAutoCloseables.pass", "1.9"); + performTest("SimpleTWR", 982, null, "resourcesAndAutoCloseables.pass", "1.9"); } public void testEmptyFileTypingExistingVarResouce() throws Exception { - performTest("SimpleTWRStart", 139, "try (f", "finalKeyword.pass", "1.9"); + performTest("SimpleTWRStart", 949, "try (f", "finalKeyword.pass", "1.9"); } public void testTypingExistingVarResouce() throws Exception { - performTest("SimpleTWRNoRes", 144, "f", "finalKeyword.pass", "1.9"); + performTest("SimpleTWRNoRes", 954, "f", "finalKeyword.pass", "1.9"); } public void testOnExistingVarResouce() throws Exception { - performTest("SimpleTWR", 173, null, "finalKeyword.pass", "1.9"); + performTest("SimpleTWR", 983, null, "finalKeyword.pass", "1.9"); } public void testEmptyFileAfterTypingExistingVarResouce() throws Exception { - performTest("SimpleTWRStart", 139, "try (fw ", "empty.pass", "1.9"); + performTest("SimpleTWRStart", 949, "try (fw ", "empty.pass", "1.9"); } public void testAfterTypingExistingVarResouce() throws Exception { - performTest("SimpleTWRNoRes", 144, "fw ", "empty.pass", "1.9"); + performTest("SimpleTWRNoRes", 954, "fw ", "empty.pass", "1.9"); } public void testAfterExistingVarResouce() throws Exception { - performTest("SimpleTWR", 174, " ", "empty.pass", "1.9"); + performTest("SimpleTWR", 984, " ", "empty.pass", "1.9"); } public void testEmptyFileBeforeTypingNewVarResouce() throws Exception { - performTest("SimpleTWRStart", 139, "try (fw;", "resourcesAndAutoCloseables.pass", "1.9"); + performTest("SimpleTWRStart", 949, "try (fw;", "resourcesAndAutoCloseables.pass", "1.9"); } public void testBeforeTypingNewVarResouce() throws Exception { - performTest("SimpleTWRNoRes", 144, "fw;", "resourcesAndAutoCloseables.pass", "1.9"); + performTest("SimpleTWRNoRes", 954, "fw;", "resourcesAndAutoCloseables.pass", "1.9"); } public void testBeforeNewVarResouce() throws Exception { - performTest("SimpleTWR", 175, null, "resourcesAndAutoCloseables.pass", "1.9"); + performTest("SimpleTWR", 985, null, "resourcesAndAutoCloseables.pass", "1.9"); } static { diff --git a/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTaskAdvancedTest.java b/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTaskAdvancedTest.java index d09756cb6..038a45a16 100644 --- a/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTaskAdvancedTest.java +++ b/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTaskAdvancedTest.java @@ -32,918 +32,918 @@ public JavaCompletionTaskAdvancedTest(String testName) { // constructor tests ------------------------------------------------------- public void testEmptyFileAfterTypingNew() throws Exception { - performTest("SimpleMethodBodyStart", 89, "boolean b;\nnew ", "declaredTypes.pass"); + performTest("SimpleMethodBodyStart", 899, "boolean b;\nnew ", "declaredTypes.pass"); } public void testAfterTypingNew() throws Exception { - performTest("SimpleEmptyMethodBody", 89, "boolean b;\nnew ", "declaredTypes.pass"); + performTest("SimpleEmptyMethodBody", 899, "boolean b;\nnew ", "declaredTypes.pass"); } public void testAfterNew() throws Exception { - performTest("AdvancedMethodBody", 121, null, "declaredTypes.pass"); + performTest("AdvancedMethodBody", 931, null, "declaredTypes.pass"); } public void testEmptyFileTypingConstructorName() throws Exception { - performTest("SimpleMethodBodyStart", 89, "boolean b;\nnew Str", "declaredTypesStartingWithStr.pass"); + performTest("SimpleMethodBodyStart", 899, "boolean b;\nnew Str", "declaredTypesStartingWithStr.pass"); } public void testTypingConstructorName() throws Exception { - performTest("SimpleEmptyMethodBody", 89, "boolean b;\nnew Str", "declaredTypesStartingWithStr.pass"); + performTest("SimpleEmptyMethodBody", 899, "boolean b;\nnew Str", "declaredTypesStartingWithStr.pass"); } public void testOnConstructorName() throws Exception { - performTest("AdvancedMethodBody", 124, null, "declaredTypesStartingWithStr.pass"); + performTest("AdvancedMethodBody", 934, null, "declaredTypesStartingWithStr.pass"); } public void testEmptyFileAfterTypingConstructorName() throws Exception { - performTest("SimpleMethodBodyStart", 89, "boolean b;\nnew String", "stringConstructors.pass"); + performTest("SimpleMethodBodyStart", 899, "boolean b;\nnew String", "stringConstructors.pass"); } public void testAfterTypingConstructorName() throws Exception { - performTest("SimpleEmptyMethodBody", 89, "boolean b;\nnew String", "stringConstructors.pass"); + performTest("SimpleEmptyMethodBody", 899, "boolean b;\nnew String", "stringConstructors.pass"); } public void testAfterConstructorName() throws Exception { - performTest("AdvancedMethodBody", 127, null, "stringConstructors.pass"); + performTest("AdvancedMethodBody", 937, null, "stringConstructors.pass"); } public void testEmptyFileBeforeTypingConstructorParam() throws Exception { - performTest("SimpleMethodBodyStart", 89, "boolean b;\nnew String(", "typesLocalMembersVarsAndSmartString.pass"); + performTest("SimpleMethodBodyStart", 899, "boolean b;\nnew String(", "typesLocalMembersVarsAndSmartString.pass"); } public void testBeforeTypingConstructorParam() throws Exception { - performTest("SimpleEmptyMethodBody", 89, "boolean b;\nnew String(", "typesLocalMembersVarsAndSmartString.pass"); + performTest("SimpleEmptyMethodBody", 899, "boolean b;\nnew String(", "typesLocalMembersVarsAndSmartString.pass"); } public void testBeforeConstructorParam() throws Exception { - performTest("AdvancedMethodBody", 128, null, "typesLocalMembersVarsAndSmartString.pass"); + performTest("AdvancedMethodBody", 938, null, "typesLocalMembersVarsAndSmartString.pass"); } public void testEmptyFileTypingConstructorParam() throws Exception { - performTest("SimpleMethodBodyStart", 89, "boolean b;\nnew String(fie", "field.pass"); + performTest("SimpleMethodBodyStart", 899, "boolean b;\nnew String(fie", "field.pass"); } public void testTypingConstructorParam() throws Exception { - performTest("SimpleEmptyMethodBody", 89, "boolean b;\nnew String(fie", "field.pass"); + performTest("SimpleEmptyMethodBody", 899, "boolean b;\nnew String(fie", "field.pass"); } public void testOnConstructorParam() throws Exception { - performTest("AdvancedMethodBody", 132, null, "field.pass"); + performTest("AdvancedMethodBody", 942, null, "field.pass"); } public void testEmptyFileAfterTypingConstructorParam() throws Exception { - performTest("SimpleMethodBodyStart", 89, "boolean b;\nnew String(field", "field.pass"); + performTest("SimpleMethodBodyStart", 899, "boolean b;\nnew String(field", "field.pass"); } public void testAfterTypingConstructorParam() throws Exception { - performTest("SimpleEmptyMethodBody", 89, "boolean b;\nnew String(field", "field.pass"); + performTest("SimpleEmptyMethodBody", 899, "boolean b;\nnew String(field", "field.pass"); } public void testAfterConstructorParam() throws Exception { - performTest("AdvancedMethodBody", 133, null, "field.pass"); + performTest("AdvancedMethodBody", 943, null, "field.pass"); } public void testEmptyFileAfterTypingConstructorParamAndSpace() throws Exception { - performTest("SimpleMethodBodyStart", 89, "boolean b;\nnew String(field ", "empty.pass"); + performTest("SimpleMethodBodyStart", 899, "boolean b;\nnew String(field ", "empty.pass"); } public void testAfterTypingConstructorParamAndSpace() throws Exception { - performTest("SimpleEmptyMethodBody", 89, "boolean b;\nnew String(field ", "empty.pass"); + performTest("SimpleEmptyMethodBody", 899, "boolean b;\nnew String(field ", "empty.pass"); } public void testAfterConstructorParamAndSpace() throws Exception { - performTest("AdvancedMethodBody", 133, " ", "empty.pass"); + performTest("AdvancedMethodBody", 943, " ", "empty.pass"); } public void testEmptyFileAfterTypingConstructor() throws Exception { - performTest("SimpleMethodBodyStart", 89, "boolean b;\nnew String(field)", "instanceOf.pass"); + performTest("SimpleMethodBodyStart", 899, "boolean b;\nnew String(field)", "instanceOf.pass"); } public void testAfterTypingConstructor() throws Exception { - performTest("SimpleEmptyMethodBody", 89, "boolean b;\nnew String(field)", "instanceOf.pass"); + performTest("SimpleEmptyMethodBody", 899, "boolean b;\nnew String(field)", "instanceOf.pass"); } public void testAfterConstructor() throws Exception { - performTest("AdvancedMethodBody", 134, null, "instanceOf.pass"); + performTest("AdvancedMethodBody", 944, null, "instanceOf.pass"); } public void testEmptyFileAfterTypingConstructorAndSpace() throws Exception { - performTest("SimpleMethodBodyStart", 89, "boolean b;\nnew String(field) ", "instanceOf.pass"); + performTest("SimpleMethodBodyStart", 899, "boolean b;\nnew String(field) ", "instanceOf.pass"); } public void testAfterTypingConstructorAndSpace() throws Exception { - performTest("SimpleEmptyMethodBody", 89, "boolean b;\nnew String(field) ", "instanceOf.pass"); + performTest("SimpleEmptyMethodBody", 899, "boolean b;\nnew String(field) ", "instanceOf.pass"); } public void testAfterConstructorAndSpace() throws Exception { - performTest("AdvancedMethodBody", 134, " ", "instanceOf.pass"); + performTest("AdvancedMethodBody", 944, " ", "instanceOf.pass"); } public void testEmptyFileAfterTypingConstructorAndDot() throws Exception { - performTest("SimpleMethodBodyStart", 89, "boolean b;\nnew String(field).", "stringContent.pass"); + performTest("SimpleMethodBodyStart", 899, "boolean b;\nnew String(field).", "stringContent.pass"); } public void testAfterTypingConstructorAndDot() throws Exception { - performTest("SimpleEmptyMethodBody", 89, "boolean b;\nnew String(field).", "stringContent.pass"); + performTest("SimpleEmptyMethodBody", 899, "boolean b;\nnew String(field).", "stringContent.pass"); } public void testAfterConstructorAndDot() throws Exception { - performTest("AdvancedMethodBody", 135, null, "stringContent.pass"); + performTest("AdvancedMethodBody", 945, null, "stringContent.pass"); } // primitive_type.class tests ---------------------------------------------- public void testEmptyFileAfterTypingPrimitiveTypeAndDot() throws Exception { - performTest("SimpleMethodBodyStart", 89, "boolean.", "classKeyword.pass"); + performTest("SimpleMethodBodyStart", 899, "boolean.", "classKeyword.pass"); } public void testAfterTypingPrimitiveTypeAndDot() throws Exception { - performTest("SimpleEmptyMethodBody", 89, "boolean.", "classKeyword.pass"); + performTest("SimpleEmptyMethodBody", 899, "boolean.", "classKeyword.pass"); } public void testAfterPrimitiveTypeAndDot() throws Exception { - performTest("AdvancedMethodBody", 169, null, "classKeyword.pass"); + performTest("AdvancedMethodBody", 979, null, "classKeyword.pass"); } public void testEmptyFileTypingPrimitiveTypeDotClass() throws Exception { - performTest("SimpleMethodBodyStart", 89, "boolean.c", "classKeyword.pass"); + performTest("SimpleMethodBodyStart", 899, "boolean.c", "classKeyword.pass"); } public void testTypingPrimitiveTypeDotClass() throws Exception { - performTest("SimpleEmptyMethodBody", 89, "boolean.c", "classKeyword.pass"); + performTest("SimpleEmptyMethodBody", 899, "boolean.c", "classKeyword.pass"); } public void testOnPrimitiveTypeDotClass() throws Exception { - performTest("AdvancedMethodBody", 170, null, "classKeyword.pass"); + performTest("AdvancedMethodBody", 980, null, "classKeyword.pass"); } public void testEmptyFileAfterTypingPrimitiveTypeDotClass() throws Exception { - performTest("SimpleMethodBodyStart", 89, "boolean.class", "classKeyword.pass"); + performTest("SimpleMethodBodyStart", 899, "boolean.class", "classKeyword.pass"); } public void testAfterTypingPrimitiveTypeDotClass() throws Exception { - performTest("SimpleEmptyMethodBody", 89, "boolean.class", "classKeyword.pass"); + performTest("SimpleEmptyMethodBody", 899, "boolean.class", "classKeyword.pass"); } public void testAfterPrimitiveTypeDotClass() throws Exception { - performTest("AdvancedMethodBody", 174, null, "classKeyword.pass"); + performTest("AdvancedMethodBody", 984, null, "classKeyword.pass"); } // Boolean.FALSE.booleanValue() like tests --------------------------------- public void testEmptyFileTypingBooleanValue() throws Exception { - performTest("SimpleMethodBodyStart", 89, "Boolean.FALSE.boolean", "booleanValue.pass"); + performTest("SimpleMethodBodyStart", 899, "Boolean.FALSE.boolean", "booleanValue.pass"); } public void testTypingBooleanValue() throws Exception { - performTest("SimpleEmptyMethodBody", 89, "Boolean.FALSE.boolean", "booleanValue.pass"); + performTest("SimpleEmptyMethodBody", 899, "Boolean.FALSE.boolean", "booleanValue.pass"); } public void testOnBooleanValue() throws Exception { - performTest("AdvancedMethodBody", 198, null, "booleanValue.pass"); + performTest("AdvancedMethodBody", 1008, null, "booleanValue.pass"); } // Expression in field init tests ------------------------------------------ public void testEmptyFileTypingParenWithinInitOfField() throws Exception { - performTest("MethodStart", 40, "public static int staticField;\npublic int field;\npublic Number num = (", "typesLocalMembersAndSmartNumber.pass"); + performTest("MethodStart", 850, "public static int staticField;\npublic int field;\npublic Number num = (", "typesLocalMembersAndSmartNumber.pass"); } public void testTypingParenWithinInitOfField() throws Exception { - performTest("FieldNoInit", 114, " = (", "typesLocalMembersAndSmartNumber.pass"); + performTest("FieldNoInit", 924, " = (", "typesLocalMembersAndSmartNumber.pass"); } public void testAfterParenWithinInitOfField() throws Exception { - performTest("Field", 141, null, "typesLocalMembersAndSmartNumber.pass"); + performTest("Field", 951, null, "typesLocalMembersAndSmartNumber.pass"); } public void testEmptyFileTypingSecondParenWithinInitOfField() throws Exception { - performTest("MethodStart", 40, "public static int staticField;\npublic int field;\npublic Number num = ((", "typesLocalMembersAndSmartNumber.pass"); + performTest("MethodStart", 850, "public static int staticField;\npublic int field;\npublic Number num = ((", "typesLocalMembersAndSmartNumber.pass"); } public void testTypingSecondParenWithinInitOfField() throws Exception { - performTest("FieldNoInit", 114, " = ((", "typesLocalMembersAndSmartNumber.pass"); + performTest("FieldNoInit", 924, " = ((", "typesLocalMembersAndSmartNumber.pass"); } public void testAfterSecondParenWithinInitOfField() throws Exception { - performTest("Field", 142, null, "typesLocalMembersAndSmartNumber.pass"); + performTest("Field", 952, null, "typesLocalMembersAndSmartNumber.pass"); } public void testEmptyFileTypingSecondParenAndSpaceWithinInitOfField() throws Exception { - performTest("MethodStart", 40, "public static int staticField;\npublic int field;\npublic Number num = (( ", "typesLocalMembersAndSmartNumber.pass"); + performTest("MethodStart", 850, "public static int staticField;\npublic int field;\npublic Number num = (( ", "typesLocalMembersAndSmartNumber.pass"); } public void testTypingSecondParenAndSpaceWithinInitOfField() throws Exception { - performTest("FieldNoInit", 114, " = (( ", "typesLocalMembersAndSmartNumber.pass"); + performTest("FieldNoInit", 924, " = (( ", "typesLocalMembersAndSmartNumber.pass"); } public void testAfterSecondParenAndSpaceWithinInitOfField() throws Exception { - performTest("Field", 142, " ", "typesLocalMembersAndSmartNumber.pass"); + performTest("Field", 952, " ", "typesLocalMembersAndSmartNumber.pass"); } public void testEmptyFileTypingCastTypeWithinInitOfField() throws Exception { - performTest("MethodStart", 40, "public static int staticField;\npublic int field;\npublic Number num = ((Number ", "empty.pass"); + performTest("MethodStart", 850, "public static int staticField;\npublic int field;\npublic Number num = ((Number ", "empty.pass"); } public void testTypingCastTypeWithinInitOfField() throws Exception { - performTest("FieldNoInit", 114, " = ((Number ", "empty.pass"); + performTest("FieldNoInit", 924, " = ((Number ", "empty.pass"); } public void testOnCastTypeWithinInitOfField() throws Exception { - performTest("Field", 148, " ", "empty.pass"); + performTest("Field", 958, " ", "empty.pass"); } public void testEmptyFileAfterTypingCastTypeWithinInitOfField() throws Exception { - performTest("MethodStart", 40, "public static int staticField;\npublic int field;\npublic Number num = ((Number)", "typesAndLocalMembers1.pass"); + performTest("MethodStart", 850, "public static int staticField;\npublic int field;\npublic Number num = ((Number)", "typesAndLocalMembers1.pass"); } public void testAfterTypingCastTypeWithinInitOfField() throws Exception { - performTest("FieldNoInit", 114, " = ((Number)", "typesAndLocalMembers1.pass"); + performTest("FieldNoInit", 924, " = ((Number)", "typesAndLocalMembers1.pass"); } public void testAfterCastTypeWithinInitOfField() throws Exception { - performTest("Field", 149, null, "typesAndLocalMembers1.pass"); + performTest("Field", 959, null, "typesAndLocalMembers1.pass"); } public void testEmptyFileTypingCastAndSpaceWithinInitOfField() throws Exception { - performTest("MethodStart", 40, "public static int staticField;\npublic int field;\npublic Number num = ((Number) ", "typesAndLocalMembers1.pass"); + performTest("MethodStart", 850, "public static int staticField;\npublic int field;\npublic Number num = ((Number) ", "typesAndLocalMembers1.pass"); } public void testTypingCastAndSpaceWithinInitOfField() throws Exception { - performTest("FieldNoInit", 114, " = ((Number) ", "typesAndLocalMembers1.pass"); + performTest("FieldNoInit", 924, " = ((Number) ", "typesAndLocalMembers1.pass"); } public void testAfterCastAndSpaceWithinInitOfField() throws Exception { - performTest("Field", 149, " ", "typesAndLocalMembers1.pass"); + performTest("Field", 959, " ", "typesAndLocalMembers1.pass"); } public void testEmptyFileTypingCastAndMethodWithinInitOfField() throws Exception { - performTest("MethodStart", 40, "public static int staticField;\npublic int field;\npublic Number num = ((Number)h", "hashCode.pass"); + performTest("MethodStart", 850, "public static int staticField;\npublic int field;\npublic Number num = ((Number)h", "hashCode.pass"); } public void testTypingCastAndMethodWithinInitOfField() throws Exception { - performTest("FieldNoInit", 114, " = ((Number)h", "hashCode.pass"); + performTest("FieldNoInit", 924, " = ((Number)h", "hashCode.pass"); } public void testOnCastAndMethodWithinInitOfField() throws Exception { - performTest("Field", 150, null, "hashCode.pass"); + performTest("Field", 960, null, "hashCode.pass"); } public void testEmptyFileAfterTypingCastAndMethodWithinInitOfField() throws Exception { - performTest("MethodStart", 40, "public static int staticField;\npublic int field;\npublic Number num = ((Number)hashCode())", "instanceOf.pass"); + performTest("MethodStart", 850, "public static int staticField;\npublic int field;\npublic Number num = ((Number)hashCode())", "instanceOf.pass"); } public void testAfterTypingCastAndMethodWithinInitOfField() throws Exception { - performTest("FieldNoInit", 114, " = ((Number)hashCode())", "instanceOf.pass"); + performTest("FieldNoInit", 924, " = ((Number)hashCode())", "instanceOf.pass"); } public void testAfterCastAndMethodWithinInitOfField() throws Exception { - performTest("Field", 160, null, "instanceOf.pass"); + performTest("Field", 970, null, "instanceOf.pass"); } public void testEmptyFileAfterTypingCastWithinInitOfField() throws Exception { - performTest("MethodStart", 40, "public static int staticField;\npublic int field;\npublic Number num = ((Number)hashCode()).", "numberContent.pass"); + performTest("MethodStart", 850, "public static int staticField;\npublic int field;\npublic Number num = ((Number)hashCode()).", "numberContent.pass"); } public void testAfterTypingCastWithinInitOfField() throws Exception { - performTest("FieldNoInit", 114, " = ((Number)hashCode()).", "numberContent.pass"); + performTest("FieldNoInit", 924, " = ((Number)hashCode()).", "numberContent.pass"); } public void testAfterCastWithinInitOfField() throws Exception { - performTest("Field", 161, null, "numberContent.pass"); + performTest("Field", 971, null, "numberContent.pass"); } public void testEmptyFileBeforeTypingInstanceofWithinInitOfField() throws Exception { - performTest("MethodStart", 40, "public static int staticField;\npublic int field;\npublic Number num = ((Number)hashCode()).intValue();\npublic boolean b = num ", "instanceOf.pass"); + performTest("MethodStart", 850, "public static int staticField;\npublic int field;\npublic Number num = ((Number)hashCode()).intValue();\npublic boolean b = num ", "instanceOf.pass"); } public void testBeforeTypingInstanceofWithinInitOfField() throws Exception { - performTest("FieldNoInit", 136, " = num ", "instanceOf.pass"); + performTest("FieldNoInit", 946, " = num ", "instanceOf.pass"); } public void testBeforeInstanceofWithinInitOfField() throws Exception { - performTest("Field", 200, null, "instanceOf.pass"); + performTest("Field", 1010, null, "instanceOf.pass"); } public void testEmptyFileTypingInstanceofWithinInitOfField() throws Exception { - performTest("MethodStart", 40, "public static int staticField;\npublic int field;\npublic Number num = ((Number)hashCode()).intValue();\npublic boolean b = num i", "instanceOf.pass"); + performTest("MethodStart", 850, "public static int staticField;\npublic int field;\npublic Number num = ((Number)hashCode()).intValue();\npublic boolean b = num i", "instanceOf.pass"); } public void testTypingInstanceofWithinInitOfField() throws Exception { - performTest("FieldNoInit", 136, " = num i", "instanceOf.pass"); + performTest("FieldNoInit", 946, " = num i", "instanceOf.pass"); } public void testInstanceofWithinInitOfField() throws Exception { - performTest("Field", 201, null, "instanceOf.pass"); + performTest("Field", 1011, null, "instanceOf.pass"); } public void testEmptyFileAfterTypingInstanceofWithinInitOfField() throws Exception { - performTest("MethodStart", 40, "public static int staticField;\npublic int field;\npublic Number num = ((Number)hashCode()).intValue();\npublic boolean b = num instanceof ", "declaredTypes.pass"); + performTest("MethodStart", 850, "public static int staticField;\npublic int field;\npublic Number num = ((Number)hashCode()).intValue();\npublic boolean b = num instanceof ", "declaredTypes.pass"); } public void testAfterTypingInstanceofWithinInitOfField() throws Exception { - performTest("FieldNoInit", 136, " = num instanceof ", "declaredTypes.pass"); + performTest("FieldNoInit", 946, " = num instanceof ", "declaredTypes.pass"); } public void testAfterInstanceofWithinInitOfField() throws Exception { - performTest("Field", 211, null, "declaredTypes.pass"); + performTest("Field", 1021, null, "declaredTypes.pass"); } public void testEmptyFileTypingInstanceofTypeWithinInitOfField() throws Exception { - performTest("MethodStart", 40, "public static int staticField;\npublic int field;\npublic Number num = ((Number)hashCode()).intValue();\npublic boolean b = num instanceof I", "javaLangContentStartingWithI.pass"); + performTest("MethodStart", 850, "public static int staticField;\npublic int field;\npublic Number num = ((Number)hashCode()).intValue();\npublic boolean b = num instanceof I", "javaLangContentStartingWithI.pass"); } public void testTypingInstanceofTypeWithinInitOfField() throws Exception { - performTest("FieldNoInit", 136, " = num instanceof I", "javaLangContentStartingWithI.pass"); + performTest("FieldNoInit", 946, " = num instanceof I", "javaLangContentStartingWithI.pass"); } public void testOnInstanceofTypeWithinInitOfField() throws Exception { - performTest("Field", 212, null, "javaLangContentStartingWithI.pass"); + performTest("Field", 1022, null, "javaLangContentStartingWithI.pass"); } // For loop tests ---------------------------------------------------------- public void testEmptyFileAfterTypingForKeywordAndSpace() throws Exception { - performTest("SimpleMethodBodyStart", 98, "for ", "empty.pass"); + performTest("SimpleMethodBodyStart", 908, "for ", "empty.pass"); } public void testAfterTypingForKeywordAndSpace() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "for ", "empty.pass"); + performTest("SimpleEmptyMethodBody", 908, "for ", "empty.pass"); } public void testAfterForKeywordAndSpace() throws Exception { - performTest("For", 102, null, "empty.pass"); + performTest("For", 912, null, "empty.pass"); } public void testEmptyFileAfterTypingForKeywordAndParen() throws Exception { - performTest("SimpleMethodBodyStart", 98, "for (", "typesLocalFieldsAndVars.pass"); + performTest("SimpleMethodBodyStart", 908, "for (", "typesLocalFieldsAndVars.pass"); } public void testAfterTypingForKeywordAndParen() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "for (", "typesLocalFieldsAndVars.pass"); + performTest("SimpleEmptyMethodBody", 908, "for (", "typesLocalFieldsAndVars.pass"); } public void testAfterForKeywordAndParen() throws Exception { - performTest("For", 103, null, "typesLocalFieldsAndVars.pass"); + performTest("For", 913, null, "typesLocalFieldsAndVars.pass"); } public void testEmptyFileAfterTypingForVarTypeAndSpace() throws Exception { - performTest("SimpleMethodBodyStart", 98, "for (int ", "intVarName.pass"); + performTest("SimpleMethodBodyStart", 908, "for (int ", "intVarName.pass"); } public void testAfterTypingForVarTypeAndSpace() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "for (int ", "intVarName.pass"); + performTest("SimpleEmptyMethodBody", 908, "for (int ", "intVarName.pass"); } public void testAfterForVarTypeAndSpace() throws Exception { - performTest("For", 107, null, "intVarName.pass"); + performTest("For", 917, null, "intVarName.pass"); } public void testEmptyFileAfterTypingForVarAndSpace() throws Exception { - performTest("SimpleMethodBodyStart", 98, "for (int i ", "empty.pass"); + performTest("SimpleMethodBodyStart", 908, "for (int i ", "empty.pass"); } public void testAfterTypingForVarAndSpace() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "for (int i ", "empty.pass"); + performTest("SimpleEmptyMethodBody", 908, "for (int i ", "empty.pass"); } public void testAfterForVarAndSpace() throws Exception { - performTest("For", 109, null, "empty.pass"); + performTest("For", 919, null, "empty.pass"); } public void testEmptyFileBeforTypingForVarInit() throws Exception { - performTest("SimpleMethodBodyStart", 98, "for (int i = ", "typesLocalMembersVarsAndSmartInt.pass"); + performTest("SimpleMethodBodyStart", 908, "for (int i = ", "typesLocalMembersVarsAndSmartInt.pass"); } public void testBeforTypingForVarInit() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "for (int i = ", "typesLocalMembersVarsAndSmartInt.pass"); + performTest("SimpleEmptyMethodBody", 908, "for (int i = ", "typesLocalMembersVarsAndSmartInt.pass"); } public void testBeforeForVarInit() throws Exception { - performTest("For", 111, null, "typesLocalMembersVarsAndSmartInt.pass"); + performTest("For", 921, null, "typesLocalMembersVarsAndSmartInt.pass"); } public void testEmptyFileAfterTypingForVarInitAndSpace() throws Exception { - performTest("SimpleMethodBodyStart", 98, "for (int i = 0 ", "empty.pass"); + performTest("SimpleMethodBodyStart", 908, "for (int i = 0 ", "empty.pass"); } public void testAfterTypingForVarInitAndSpace() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "for (int i = 0 ", "empty.pass"); + performTest("SimpleEmptyMethodBody", 908, "for (int i = 0 ", "empty.pass"); } public void testAfterForVarInitAndSpace() throws Exception { - performTest("For", 112, " ", "empty.pass"); + performTest("For", 922, " ", "empty.pass"); } public void testEmptyFileBeforTypingForCondition() throws Exception { - performTest("SimpleMethodBodyStart", 98, "for (int i = 0;", "typesLocalMembersVarsAndSmartBoolean.pass"); + performTest("SimpleMethodBodyStart", 908, "for (int i = 0;", "typesLocalMembersVarsAndSmartBoolean.pass"); } public void testBeforTypingForCondition() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "for (int i = 0;", "typesLocalMembersVarsAndSmartBoolean.pass"); + performTest("SimpleEmptyMethodBody", 908, "for (int i = 0;", "typesLocalMembersVarsAndSmartBoolean.pass"); } public void testBeforeForCondition() throws Exception { - performTest("For", 113, null, "typesLocalMembersVarsAndSmartBoolean.pass"); + performTest("For", 923, null, "typesLocalMembersVarsAndSmartBoolean.pass"); } public void testEmptyFileBeforTypingForConditionAndSpace() throws Exception { - performTest("SimpleMethodBodyStart", 98, "for (int i = 0; ", "typesLocalMembersVarsAndSmartBoolean.pass"); + performTest("SimpleMethodBodyStart", 908, "for (int i = 0; ", "typesLocalMembersVarsAndSmartBoolean.pass"); } public void testBeforTypingForConditionAndSpace() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "for (int i = 0; ", "typesLocalMembersVarsAndSmartBoolean.pass"); + performTest("SimpleEmptyMethodBody", 908, "for (int i = 0; ", "typesLocalMembersVarsAndSmartBoolean.pass"); } public void testBeforeForConditionAndSpace() throws Exception { - performTest("For", 114, null, "typesLocalMembersVarsAndSmartBoolean.pass"); + performTest("For", 924, null, "typesLocalMembersVarsAndSmartBoolean.pass"); } public void testEmptyFileAfterTypingForConditionAndSpace() throws Exception { - performTest("SimpleMethodBodyStart", 98, "for (int i = 0; i < a ", "empty.pass"); + performTest("SimpleMethodBodyStart", 908, "for (int i = 0; i < a ", "empty.pass"); } public void testAfterTypingForConditionAndSpace() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "for (int i = 0; i < a ", "empty.pass"); + performTest("SimpleEmptyMethodBody", 908, "for (int i = 0; i < a ", "empty.pass"); } public void testAfterForConditionAndSpace() throws Exception { - performTest("For", 119, " ", "empty.pass"); + performTest("For", 929, " ", "empty.pass"); } public void testEmptyFileBeforTypingForUpdateExpression() throws Exception { - performTest("SimpleMethodBodyStart", 98, "for (int i = 0; i < a;", "typesLocalMembersAndVars2.pass"); + performTest("SimpleMethodBodyStart", 908, "for (int i = 0; i < a;", "typesLocalMembersAndVars2.pass"); } public void testBeforTypingForUpdateExpression() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "for (int i = 0; i < a;", "typesLocalMembersAndVars2.pass"); + performTest("SimpleEmptyMethodBody", 908, "for (int i = 0; i < a;", "typesLocalMembersAndVars2.pass"); } public void testBeforeForUpdateExpression() throws Exception { - performTest("For", 120, null, "typesLocalMembersAndVars2.pass"); + performTest("For", 930, null, "typesLocalMembersAndVars2.pass"); } public void testEmptyFileBeforTypingForUpdateExpressionAndSpace() throws Exception { - performTest("SimpleMethodBodyStart", 98, "for (int i = 0; i < a; ", "typesLocalMembersAndVars2.pass"); + performTest("SimpleMethodBodyStart", 908, "for (int i = 0; i < a; ", "typesLocalMembersAndVars2.pass"); } public void testBeforTypingForUpdateExpressionAndSpace() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "for (int i = 0; i < a; ", "typesLocalMembersAndVars2.pass"); + performTest("SimpleEmptyMethodBody", 908, "for (int i = 0; i < a; ", "typesLocalMembersAndVars2.pass"); } public void testBeforeForUpdateExpressionAndSpace() throws Exception { - performTest("For", 121, null, "typesLocalMembersAndVars2.pass"); + performTest("For", 931, null, "typesLocalMembersAndVars2.pass"); } public void testEmptyFileAfterTypingForUpdateExpressionAndSpace() throws Exception { - performTest("SimpleMethodBodyStart", 98, "for (int i = 0; i < a; i++ ", "empty.pass"); + performTest("SimpleMethodBodyStart", 908, "for (int i = 0; i < a; i++ ", "empty.pass"); } public void testAfterTypingForUpdateExpressionAndSpace() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "for (int i = 0 ; i < a; i++ ", "empty.pass"); + performTest("SimpleEmptyMethodBody", 908, "for (int i = 0 ; i < a; i++ ", "empty.pass"); } public void testAfterForUpdateExpressionAndSpace() throws Exception { - performTest("For", 124, " ", "empty.pass"); + performTest("For", 934, " ", "empty.pass"); } public void testEmptyFileAfterTypingForUpdateExpressionAndParen() throws Exception { - performTest("SimpleMethodBodyStart", 98, "for (int i = 0; i < a; i++)", "methodBodyContentAfterFor.pass"); + performTest("SimpleMethodBodyStart", 908, "for (int i = 0; i < a; i++)", "methodBodyContentAfterFor.pass"); } public void testAfterTypingForUpdateExpressionAndParen() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "for (int i = 0; i < a; i++)", "methodBodyContentAfterFor.pass"); + performTest("SimpleEmptyMethodBody", 908, "for (int i = 0; i < a; i++)", "methodBodyContentAfterFor.pass"); } public void testAfterForUpdateExpressionAndParen() throws Exception { - performTest("For", 125, null, "methodBodyContentAfterFor.pass"); + performTest("For", 935, null, "methodBodyContentAfterFor.pass"); } public void testEmptyFileAfterTypingForUpdateExpressionParenAndSpace() throws Exception { - performTest("SimpleMethodBodyStart", 98, "for (int i = 0; i < a; i++) ", "methodBodyContentAfterFor.pass"); + performTest("SimpleMethodBodyStart", 908, "for (int i = 0; i < a; i++) ", "methodBodyContentAfterFor.pass"); } public void testAfterTypingForUpdateExpressionParenAndSpace() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "for (int i = 0; i < a; i++) ", "methodBodyContentAfterFor.pass"); + performTest("SimpleEmptyMethodBody", 908, "for (int i = 0; i < a; i++) ", "methodBodyContentAfterFor.pass"); } public void testAfterForUpdateExpressionParenAndSpace() throws Exception { - performTest("For", 126, null, "methodBodyContentAfterFor.pass"); + performTest("For", 936, null, "methodBodyContentAfterFor.pass"); } public void testEmptyFileInsideForBody() throws Exception { - performTest("SimpleMethodBodyStart", 98, "for (int i = 0; i < a; i++) {\n", "blockContentAfterFor.pass"); + performTest("SimpleMethodBodyStart", 908, "for (int i = 0; i < a; i++) {\n", "blockContentAfterFor.pass"); } public void testTypingInsideForBody() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "for (int i = 0; i < a; i++) {\n", "blockContentAfterFor.pass"); + performTest("SimpleEmptyMethodBody", 908, "for (int i = 0; i < a; i++) {\n", "blockContentAfterFor.pass"); } public void testInsideForBody() throws Exception { - performTest("For", 127, null, "blockContentAfterFor.pass"); + performTest("For", 937, null, "blockContentAfterFor.pass"); } // For-each loop tests ----------------------------------------------------- public void testEmptyFileBeforTypingForEachExpression() throws Exception { - performTest("SimpleMethodBodyStart", 98, "for (Byte b :", "typesLocalMembersAndVars1.pass"); + performTest("SimpleMethodBodyStart", 908, "for (Byte b :", "typesLocalMembersAndVars1.pass"); } public void testBeforTypingForEachExpression() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "for (Byte b :", "typesLocalMembersAndVars1.pass"); + performTest("SimpleEmptyMethodBody", 908, "for (Byte b :", "typesLocalMembersAndVars1.pass"); } public void testBeforeForEachExpression() throws Exception { - performTest("ForEach", 111, null, "typesLocalMembersAndVars1.pass"); + performTest("ForEach", 921, null, "typesLocalMembersAndVars1.pass"); } public void testEmptyFileBeforTypingForEachExpressionAndSpace() throws Exception { - performTest("SimpleMethodBodyStart", 98, "for (Byte b : ", "typesLocalMembersAndVars1.pass"); + performTest("SimpleMethodBodyStart", 908, "for (Byte b : ", "typesLocalMembersAndVars1.pass"); } public void testBeforTypingForEachExpressionAndSpace() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "for (Byte b : ", "typesLocalMembersAndVars1.pass"); + performTest("SimpleEmptyMethodBody", 908, "for (Byte b : ", "typesLocalMembersAndVars1.pass"); } public void testBeforeForEachExpressionAndSpace() throws Exception { - performTest("ForEach", 112, null, "typesLocalMembersAndVars1.pass"); + performTest("ForEach", 922, null, "typesLocalMembersAndVars1.pass"); } public void testEmptyFileAfterTypingForEachExpressionAndSpace() throws Exception { - performTest("SimpleMethodBodyStart", 98, "for (Byte b : field.getBytes() ", "empty.pass"); + performTest("SimpleMethodBodyStart", 908, "for (Byte b : field.getBytes() ", "empty.pass"); } public void testAfterTypingForEachExpressionAndSpace() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "for (Byte b : field.getBytes() ", "empty.pass"); + performTest("SimpleEmptyMethodBody", 908, "for (Byte b : field.getBytes() ", "empty.pass"); } public void testAfterForEachExpressionAndSpace() throws Exception { - performTest("ForEach", 128, " ", "empty.pass"); + performTest("ForEach", 938, " ", "empty.pass"); } public void testEmptyFileAfterTypingForEachExpressionAndParen() throws Exception { - performTest("SimpleMethodBodyStart", 98, "for (Byte b : field.getBytes())", "methodBodyContentAfterForEach.pass"); + performTest("SimpleMethodBodyStart", 908, "for (Byte b : field.getBytes())", "methodBodyContentAfterForEach.pass"); } public void testAfterTypingForEachExpressionAndParen() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "for (Byte b : field.getBytes())", "methodBodyContentAfterForEach.pass"); + performTest("SimpleEmptyMethodBody", 908, "for (Byte b : field.getBytes())", "methodBodyContentAfterForEach.pass"); } public void testAfterForEachExpressionAndParen() throws Exception { - performTest("ForEach", 129, null, "methodBodyContentAfterForEach.pass"); + performTest("ForEach", 939, null, "methodBodyContentAfterForEach.pass"); } public void testEmptyFileAfterTypingForEachExpressionParenAndSpace() throws Exception { - performTest("SimpleMethodBodyStart", 98, "for (Byte b : field.getBytes()) ", "methodBodyContentAfterForEach.pass"); + performTest("SimpleMethodBodyStart", 908, "for (Byte b : field.getBytes()) ", "methodBodyContentAfterForEach.pass"); } public void testAfterTypingForEachExpressionParenAndSpace() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "for (Byte b : field.getBytes()) ", "methodBodyContentAfterForEach.pass"); + performTest("SimpleEmptyMethodBody", 908, "for (Byte b : field.getBytes()) ", "methodBodyContentAfterForEach.pass"); } public void testAfterForEachExpressionParenAndSpace() throws Exception { - performTest("ForEach", 130, null, "methodBodyContentAfterForEach.pass"); + performTest("ForEach", 940, null, "methodBodyContentAfterForEach.pass"); } public void testEmptyFileInsideForEachBody() throws Exception { - performTest("SimpleMethodBodyStart", 98, "for (Byte b : field.getBytes()) {\n", "blockContentAfterForEach.pass"); + performTest("SimpleMethodBodyStart", 908, "for (Byte b : field.getBytes()) {\n", "blockContentAfterForEach.pass"); } public void testTypingInsideForEachBody() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "for (Byte b : field.getBytes()) {\n", "blockContentAfterForEach.pass"); + performTest("SimpleEmptyMethodBody", 908, "for (Byte b : field.getBytes()) {\n", "blockContentAfterForEach.pass"); } public void testInsideForEachBody() throws Exception { - performTest("ForEach", 131, null, "blockContentAfterForEach.pass"); + performTest("ForEach", 941, null, "blockContentAfterForEach.pass"); } // Switch-case statement tests --------------------------------------------- public void testEmptyFileAfterTypingSwitchKeyword() throws Exception { - performTest("SimpleMethodBodyStart", 98, "switch", "switchKeyword.pass"); + performTest("SimpleMethodBodyStart", 908, "switch", "switchKeyword.pass"); } public void testAfterTypingSwitchKeyword() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "switch", "switchKeyword.pass"); + performTest("SimpleEmptyMethodBody", 908, "switch", "switchKeyword.pass"); } public void testAfterSwitchKeyword() throws Exception { - performTest("Switch", 104, null, "switchKeyword.pass"); + performTest("Switch", 914, null, "switchKeyword.pass"); } public void testEmptyFileAfterTypingSwitchKeywordAndSpace() throws Exception { - performTest("SimpleMethodBodyStart", 98, "switch ", "empty.pass"); + performTest("SimpleMethodBodyStart", 908, "switch ", "empty.pass"); } public void testAfterTypingSwitchKeywordAndSpace() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "switch ", "empty.pass"); + performTest("SimpleEmptyMethodBody", 908, "switch ", "empty.pass"); } public void testAfterSwitchKeywordAndSpace() throws Exception { - performTest("Switch", 105, null, "empty.pass"); + performTest("Switch", 915, null, "empty.pass"); } public void testEmptyFileAfterTypingSwitchKeywordAndParen() throws Exception { - performTest("SimpleMethodBodyStart", 98, "switch (", "typesLocalMembersVarsAndSmartEnumAndInt.pass"); + performTest("SimpleMethodBodyStart", 908, "switch (", "typesLocalMembersVarsAndSmartEnumAndInt.pass"); } public void testAfterTypingSwitchKeywordAndParen() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "switch (", "typesLocalMembersVarsAndSmartEnumAndInt.pass"); + performTest("SimpleEmptyMethodBody", 908, "switch (", "typesLocalMembersVarsAndSmartEnumAndInt.pass"); } public void testAfterSwitchKeywordAndParen() throws Exception { - performTest("Switch", 106, null, "typesLocalMembersVarsAndSmartEnumAndInt.pass"); + performTest("Switch", 916, null, "typesLocalMembersVarsAndSmartEnumAndInt.pass"); } public void testEmptyFileAfterTypingSwitchExpression() throws Exception { - performTest("SimpleMethodBodyStart", 98, "switch (a", "a.pass"); + performTest("SimpleMethodBodyStart", 908, "switch (a", "a.pass"); } public void testAfterTypingSwitchExpression() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "switch (a", "a.pass"); + performTest("SimpleEmptyMethodBody", 908, "switch (a", "a.pass"); } public void testAfterSwitchExpression() throws Exception { - performTest("Switch", 107, null, "a.pass"); + performTest("Switch", 917, null, "a.pass"); } public void testEmptyFileAfterTypingSwitchExpressionAndSpace() throws Exception { - performTest("SimpleMethodBodyStart", 98, "switch (a ", "empty.pass"); + performTest("SimpleMethodBodyStart", 908, "switch (a ", "empty.pass"); } public void testAfterTypingSwitchExpressionAndSpace() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "switch (a ", "empty.pass"); + performTest("SimpleEmptyMethodBody", 908, "switch (a ", "empty.pass"); } public void testAfterSwitchExpressionAndSpace() throws Exception { - performTest("Switch", 107, " ", "empty.pass"); + performTest("Switch", 917, " ", "empty.pass"); } public void testEmptyFileAfterTypingSwitchExpressionAndParen() throws Exception { - performTest("SimpleMethodBodyStart", 98, "switch (a) ", "empty.pass"); + performTest("SimpleMethodBodyStart", 908, "switch (a) ", "empty.pass"); } public void testAfterTypingSwitchExpressionAndParen() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "switch (a) ", "empty.pass"); + performTest("SimpleEmptyMethodBody", 908, "switch (a) ", "empty.pass"); } public void testAfterSwitchExpressionAndParen() throws Exception { - performTest("Switch", 108, null, "empty.pass"); + performTest("Switch", 918, null, "empty.pass"); } public void testEmptyFileInsideSwitchBody() throws Exception { - performTest("SimpleMethodBodyStart", 98, "switch (a) {\n", "caseAndDefaultKeywords.pass"); + performTest("SimpleMethodBodyStart", 908, "switch (a) {\n", "caseAndDefaultKeywords.pass"); } public void testTypingInsideSwitchBody() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "switch (a) {\n", "caseAndDefaultKeywords.pass"); + performTest("SimpleEmptyMethodBody", 908, "switch (a) {\n", "caseAndDefaultKeywords.pass"); } public void testInsideSwitchBody() throws Exception { - performTest("Switch", 123, null, "caseAndDefaultKeywords.pass"); + performTest("Switch", 933, null, "caseAndDefaultKeywords.pass"); } public void testEmptyFileAfterTypingCaseKeyword() throws Exception { - performTest("SimpleMethodBodyStart", 98, "switch (a) {\ncase", "caseKeyword.pass"); + performTest("SimpleMethodBodyStart", 908, "switch (a) {\ncase", "caseKeyword.pass"); } public void testAfterTypingCaseKeyword() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "switch (a) {\ncase", "caseKeyword.pass"); + performTest("SimpleEmptyMethodBody", 908, "switch (a) {\ncase", "caseKeyword.pass"); } public void testAfterCaseKeyword() throws Exception { - performTest("Switch", 127, null, "caseKeyword.pass"); + performTest("Switch", 937, null, "caseKeyword.pass"); } public void testEmptyFileAfterTypingCaseKeywordAndSpace() throws Exception { - performTest("SimpleMethodBodyStart", 98, "switch (a) {\ncase ", "declaredTypesAndSmartInt.pass"); + performTest("SimpleMethodBodyStart", 908, "switch (a) {\ncase ", "declaredTypesAndSmartInt.pass"); } public void testAfterTypingCaseKeywordAndSpace() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "switch (a) {\ncase ", "declaredTypesAndSmartInt.pass"); + performTest("SimpleEmptyMethodBody", 908, "switch (a) {\ncase ", "declaredTypesAndSmartInt.pass"); } public void testAfterCaseKeywordAndSpace() throws Exception { - performTest("Switch", 127, " ", "declaredTypesAndSmartInt.pass"); + performTest("Switch", 937, " ", "declaredTypesAndSmartInt.pass"); } public void testEmptyFileAfterTypingCaseKeywordAndColon() throws Exception { - performTest("SimpleMethodBodyStart", 98, "switch (a) {\ncase 0:", "methodBodyContentAfterCase.pass"); + performTest("SimpleMethodBodyStart", 908, "switch (a) {\ncase 0:", "methodBodyContentAfterCase.pass"); } public void testAfterTypingCaseKeywordAndColon() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "switch (a) {\ncase 0:", "methodBodyContentAfterCase.pass"); + performTest("SimpleEmptyMethodBody", 908, "switch (a) {\ncase 0:", "methodBodyContentAfterCase.pass"); } public void testAfterCaseKeywordAndColon() throws Exception { - performTest("Switch", 130, null, "methodBodyContentAfterCase.pass"); + performTest("Switch", 940, null, "methodBodyContentAfterCase.pass"); } public void testEmptyFileAfterTypingCaseKeywordAndColonAndSpace() throws Exception { - performTest("SimpleMethodBodyStart", 98, "switch (a) {\ncase 0: ", "methodBodyContentAfterCase.pass"); + performTest("SimpleMethodBodyStart", 908, "switch (a) {\ncase 0: ", "methodBodyContentAfterCase.pass"); } public void testAfterTypingCaseKeywordAndColonAndSpace() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "switch (a) {\ncase 0: ", "methodBodyContentAfterCase.pass"); + performTest("SimpleEmptyMethodBody", 908, "switch (a) {\ncase 0: ", "methodBodyContentAfterCase.pass"); } public void testAfterCaseKeywordAndColonAndSpace() throws Exception { - performTest("Switch", 131, null, "methodBodyContentAfterCase.pass"); + performTest("Switch", 941, null, "methodBodyContentAfterCase.pass"); } public void testEmptyFileAfterTypingVarInCaseBlock() throws Exception { - performTest("SimpleMethodBodyStart", 98, "switch (a) {\ncase 0:\nboolean b;\n", "methodBodyContentAfterCaseAndVar.pass"); + performTest("SimpleMethodBodyStart", 908, "switch (a) {\ncase 0:\nboolean b;\n", "methodBodyContentAfterCaseAndVar.pass"); } public void testAfterTypingVarInCaseBlock() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "switch (a) {\ncase 0:\nboolean b;\n", "methodBodyContentAfterCaseAndVar.pass"); + performTest("SimpleEmptyMethodBody", 908, "switch (a) {\ncase 0:\nboolean b;\n", "methodBodyContentAfterCaseAndVar.pass"); } public void testAfterVarInCaseBlock() throws Exception { - performTest("Switch", 158, null, "methodBodyContentAfterCaseAndVar.pass"); + performTest("Switch", 968, null, "methodBodyContentAfterCaseAndVar.pass"); } public void testEmptyFileAfterTypingBreakKeyword() throws Exception { - performTest("SimpleMethodBodyStart", 98, "switch (a) {\ncase 0:\nbreak", "breakKeyword.pass"); + performTest("SimpleMethodBodyStart", 908, "switch (a) {\ncase 0:\nbreak", "breakKeyword.pass"); } public void testAfterTypingBreakKeyword() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "switch (a) {\ncase 0:\nbreak", "breakKeyword.pass"); + performTest("SimpleEmptyMethodBody", 908, "switch (a) {\ncase 0:\nbreak", "breakKeyword.pass"); } public void testAfterBreakKeyword() throws Exception { - performTest("Switch", 179, null, "breakKeyword.pass"); + performTest("Switch", 989, null, "breakKeyword.pass"); } public void testEmptyFileAfterTypingDefaultKeyword() throws Exception { - performTest("SimpleMethodBodyStart", 98, "switch (a) {\ndefault", "defaultKeyword.pass"); + performTest("SimpleMethodBodyStart", 908, "switch (a) {\ndefault", "defaultKeyword.pass"); } public void testAfterTypingDefaultKeyword() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "switch (a) {\ndefault", "defaultKeyword.pass"); + performTest("SimpleEmptyMethodBody", 908, "switch (a) {\ndefault", "defaultKeyword.pass"); } public void testAfterDefaultKeyword() throws Exception { - performTest("Switch", 200, null, "defaultKeyword.pass"); + performTest("Switch", 1010, null, "defaultKeyword.pass"); } public void testEmptyFileAfterTypingDefaultKeywordAndSpace() throws Exception { - performTest("SimpleMethodBodyStart", 98, "switch (a) {\ndefault ", "empty.pass"); + performTest("SimpleMethodBodyStart", 908, "switch (a) {\ndefault ", "empty.pass"); } public void testAfterTypingDefaultKeywordAndSpace() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "switch (a) {\ndefault ", "empty.pass"); + performTest("SimpleEmptyMethodBody", 908, "switch (a) {\ndefault ", "empty.pass"); } public void testAfterDefaultKeywordAndSpace() throws Exception { - performTest("Switch", 200, " ", "empty.pass"); + performTest("Switch", 1010, " ", "empty.pass"); } public void testEmptyFileAfterTypingDefaultKeywordAndColon() throws Exception { - performTest("SimpleMethodBodyStart", 98, "switch (a) {\ndefault:", "methodBodyContentAfterDefault.pass"); + performTest("SimpleMethodBodyStart", 908, "switch (a) {\ndefault:", "methodBodyContentAfterDefault.pass"); } public void testAfterTypingDefaultKeywordAndColon() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "switch (a) {\ndefault:", "methodBodyContentAfterDefault.pass"); + performTest("SimpleEmptyMethodBody", 908, "switch (a) {\ndefault:", "methodBodyContentAfterDefault.pass"); } public void testAfterDefaultKeywordAndColon() throws Exception { - performTest("Switch", 201, null, "methodBodyContentAfterDefault.pass"); + performTest("Switch", 1011, null, "methodBodyContentAfterDefault.pass"); } public void testEmptyFileAfterTypingDefaultKeywordAndColonAndSpace() throws Exception { - performTest("SimpleMethodBodyStart", 98, "switch (a) {\ndefault: ", "methodBodyContentAfterDefault.pass"); + performTest("SimpleMethodBodyStart", 908, "switch (a) {\ndefault: ", "methodBodyContentAfterDefault.pass"); } public void testAfterTypingDefaultKeywordAndColonAndSpace() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "switch (a) {\ndefault: ", "methodBodyContentAfterDefault.pass"); + performTest("SimpleEmptyMethodBody", 908, "switch (a) {\ndefault: ", "methodBodyContentAfterDefault.pass"); } public void testAfterDefaultKeywordAndColonAndSpace() throws Exception { - performTest("Switch", 201, null, "methodBodyContentAfterDefault.pass"); + performTest("Switch", 1011, null, "methodBodyContentAfterDefault.pass"); } // Static initializer tests ------------------------------------------------ public void testEmptyFileAfterTypingStaticKeyword() throws Exception { - performTest("InitializersStart", 220, "static", "staticKeyword.pass"); + performTest("InitializersStart", 1030, "static", "staticKeyword.pass"); } public void testAfterTypingStaticKeyword() throws Exception { - performTest("Field", 220, "static", "staticKeyword.pass"); + performTest("Field", 1030, "static", "staticKeyword.pass"); } public void testAfterStaticKeyword() throws Exception { - performTest("Initializers", 235, null, "staticKeyword.pass"); + performTest("Initializers", 1045, null, "staticKeyword.pass"); } public void testEmptyFileAfterTypingStaticKeywordAndSpace() throws Exception { - performTest("InitializersStart", 220, "static ", "memberModifiersAndTypesWithoutStatic.pass"); + performTest("InitializersStart", 1030, "static ", "memberModifiersAndTypesWithoutStatic.pass"); } public void testAfterTypingStaticKeywordAndSpace() throws Exception { - performTest("Field", 220, "static ", "memberModifiersAndTypesWithoutStatic.pass"); + performTest("Field", 1030, "static ", "memberModifiersAndTypesWithoutStatic.pass"); } public void testAfterStaticKeywordAndSpace() throws Exception { - performTest("Initializers", 236, null, "memberModifiersAndTypesWithoutStatic.pass"); + performTest("Initializers", 1046, null, "memberModifiersAndTypesWithoutStatic.pass"); } public void testEmptyFileTypingStaticBlockBody() throws Exception { - performTest("InitializersStart", 220, "static {", "staticBlockContent.pass"); + performTest("InitializersStart", 1030, "static {", "staticBlockContent.pass"); } public void testTypingStaticBlockBody() throws Exception { - performTest("Field", 220, "static {", "staticBlockContent.pass"); + performTest("Field", 1030, "static {", "staticBlockContent.pass"); } public void testInStaticBlockBody() throws Exception { - performTest("Initializers", 237, null, "staticBlockContent.pass"); + performTest("Initializers", 1047, null, "staticBlockContent.pass"); } public void testEmptyFileTypingVarTypeInStaticBlockBody() throws Exception { - performTest("InitializersStart", 220, "static {\nin", "intKeyword.pass"); + performTest("InitializersStart", 1030, "static {\nin", "intKeyword.pass"); } public void testTypingVarTypeInStaticBlockBody() throws Exception { - performTest("Field", 220, "static {\nin", "intKeyword.pass"); + performTest("Field", 1030, "static {\nin", "intKeyword.pass"); } public void testOnVarTypeInStaticBlockBody() throws Exception { - performTest("Initializers", 248, null, "intKeyword.pass"); + performTest("Initializers", 1058, null, "intKeyword.pass"); } public void testEmptyFileBeforeTypingVarInitInStaticBlockBody() throws Exception { - performTest("InitializersStart", 220, "static {\nint i = ", "staticBlockTypesAndLocalMembers.pass"); + performTest("InitializersStart", 1030, "static {\nint i = ", "staticBlockTypesAndLocalMembers.pass"); } public void testBeforeTypingVarInitInStaticBlockBody() throws Exception { - performTest("Field", 220, "static {\nint i = ", "staticBlockTypesAndLocalMembers.pass"); + performTest("Field", 1030, "static {\nint i = ", "staticBlockTypesAndLocalMembers.pass"); } public void testBeforeVarInitInStaticBlockBody() throws Exception { - performTest("Initializers", 254, null, "staticBlockTypesAndLocalMembers.pass"); + performTest("Initializers", 1064, null, "staticBlockTypesAndLocalMembers.pass"); } public void testEmptyFileTypingVarInitInStaticBlockBody() throws Exception { - performTest("InitializersStart", 220, "static {\nint i = f", "falseAndFloatKeywords.pass"); + performTest("InitializersStart", 1030, "static {\nint i = f", "falseAndFloatKeywords.pass"); } public void testTypingVarInitInStaticBlockBody() throws Exception { - performTest("Field", 220, "static {\nint i = f", "falseAndFloatKeywords.pass"); + performTest("Field", 1030, "static {\nint i = f", "falseAndFloatKeywords.pass"); } public void testOnVarInitInStaticBlockBody() throws Exception { - performTest("Initializers", 255, null, "falseAndFloatKeywords.pass"); + performTest("Initializers", 1065, null, "falseAndFloatKeywords.pass"); } // Instance initializer tests ---------------------------------------------- public void testEmptyFileTypingInitializerBlockBody() throws Exception { - performTest("InitializersStart", 220, "{", "initBlockContent.pass"); + performTest("InitializersStart", 1030, "{", "initBlockContent.pass"); } public void testTypingInitializerBlockBody() throws Exception { - performTest("Field", 220, "{", "initBlockContent.pass"); + performTest("Field", 1030, "{", "initBlockContent.pass"); } public void testInInitializerBlockBody() throws Exception { - performTest("Initializers", 277, null, "initBlockContent.pass"); + performTest("Initializers", 1087, null, "initBlockContent.pass"); } public void testEmptyFileTypingVarTypeInInitializerBlockBody() throws Exception { - performTest("InitializersStart", 220, "{\nbo", "booleanKeyword.pass"); + performTest("InitializersStart", 1030, "{\nbo", "booleanKeyword.pass"); } public void testTypingVarTypeInInitializerBlockBody() throws Exception { - performTest("Field", 220, "{\nbo", "booleanKeyword.pass"); + performTest("Field", 1030, "{\nbo", "booleanKeyword.pass"); } public void testOnVarTypeInInitializerBlockBody() throws Exception { - performTest("Initializers", 288, null, "booleanKeyword.pass"); + performTest("Initializers", 1098, null, "booleanKeyword.pass"); } public void testEmptyFileBeforeTypingVarInitInInitializerBlockBody() throws Exception { - performTest("InitializersStart", 220, "{\nboolean b1 = ", "initBlockTypesAndLocalMembers.pass"); + performTest("InitializersStart", 1030, "{\nboolean b1 = ", "initBlockTypesAndLocalMembers.pass"); } public void testBeforeTypingVarInitInInitializerBlockBody() throws Exception { - performTest("Field", 220, "{\nboolean b1 = ", "initBlockTypesAndLocalMembers.pass"); + performTest("Field", 1030, "{\nboolean b1 = ", "initBlockTypesAndLocalMembers.pass"); } public void testBeforeVarInitInInitializerBlockBody() throws Exception { - performTest("Initializers", 299, null, "initBlockTypesAndLocalMembers.pass"); + performTest("Initializers", 1109, null, "initBlockTypesAndLocalMembers.pass"); } public void testEmptyFileTypingVarInitInInitializerBlockBody() throws Exception { - performTest("InitializersStart", 220, "{\nboolean b1 = b", "initBlockContentStartingWithB.pass"); + performTest("InitializersStart", 1030, "{\nboolean b1 = b", "initBlockContentStartingWithB.pass"); } public void testTypingVarInitInInitializerBlockBody() throws Exception { - performTest("Field", 220, "{\nboolean b1 = b", "initBlockContentStartingWithB.pass"); + performTest("Field", 1030, "{\nboolean b1 = b", "initBlockContentStartingWithB.pass"); } public void testOnVarInitInInitializerBlockBody() throws Exception { - performTest("Initializers", 300, null, "initBlockContentStartingWithB.pass"); + performTest("Initializers", 1110, null, "initBlockContentStartingWithB.pass"); } } diff --git a/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTaskBasicTest.java b/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTaskBasicTest.java index d17c1edf3..38afe93c4 100644 --- a/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTaskBasicTest.java +++ b/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTaskBasicTest.java @@ -32,1270 +32,1270 @@ public JavaCompletionTaskBasicTest(String testName) { // file beginning tests ---------------------------------------------------- public void testEmptyFile() throws Exception { - performTest("Empty", 0, null, "topLevelKeywords.pass"); + performTest("Empty", 809, null, "topLevelKeywords.pass"); } public void testFileBeginning() throws Exception { - performTest("Simple", 0, null, "topLevelKeywords.pass"); + performTest("Simple", 809, null, "topLevelKeywords.pass"); } // package declaration tests ----------------------------------------------- public void testEmptyFileTypingPackageKeyword() throws Exception { - performTest("Empty", 0, "p", "topLevelKeywordsStartingWithP.pass"); + performTest("Empty", 809, "p", "topLevelKeywordsStartingWithP.pass"); } public void testTypingPackageKeyword() throws Exception { - performTest("SimpleNoPackage", 0, "p", "topLevelKeywordsStartingWithP.pass"); + performTest("SimpleNoPackage", 809, "p", "topLevelKeywordsStartingWithP.pass"); } public void testOnPackageKeyword() throws Exception { - performTest("Simple", 1, null, "topLevelKeywordsStartingWithP.pass"); + performTest("Simple", 811, null, "topLevelKeywordsStartingWithP.pass"); } public void testEmptyFileAfterTypingPackageKeyword() throws Exception { - performTest("Empty", 0, "package", "packageKeyword.pass"); + performTest("Empty", 809, "package", "packageKeyword.pass"); } public void testAfterTypingPackageKeyword() throws Exception { - performTest("SimpleNoPackage", 0, "package", "packageKeyword.pass"); + performTest("SimpleNoPackage", 809, "package", "packageKeyword.pass"); } public void testAfterPackageKeyword() throws Exception { - performTest("Simple", 7, null, "packageKeyword.pass"); + performTest("Simple", 817, null, "packageKeyword.pass"); } public void testEmptyFileBeforeTypingPackageId() throws Exception { - performTest("Empty", 0, "package ", "empty.pass"); + performTest("Empty", 809, "package ", "empty.pass"); } public void testBeforeTypingPackageId() throws Exception { - performTest("SimpleNoPackage", 0, "package ", "empty.pass"); + performTest("SimpleNoPackage", 809, "package ", "empty.pass"); } public void testBeforePackageId() throws Exception { - performTest("Simple", 8, null, "empty.pass"); + performTest("Simple", 818, null, "empty.pass"); } public void testEmptyFileTypingPackageId() throws Exception { - performTest("Empty", 0, "package t", "empty.pass"); + performTest("Empty", 809, "package t", "empty.pass"); } public void testTypingPackageId() throws Exception { - performTest("SimpleNoPackage", 0, "package t", "empty.pass"); + performTest("SimpleNoPackage", 809, "package t", "empty.pass"); } public void testOnPackageId() throws Exception { - performTest("Simple", 9, null, "empty.pass"); + performTest("Simple", 819, null, "empty.pass"); } public void testEmptyFileAfterTypingPackageId() throws Exception { - performTest("Empty", 0, "package test", "empty.pass"); + performTest("Empty", 809, "package test", "empty.pass"); } public void testAfterTypingPackageId() throws Exception { - performTest("SimpleNoPackage", 0, "package test", "empty.pass"); + performTest("SimpleNoPackage", 809, "package test", "empty.pass"); } public void testAfterPackageId() throws Exception { - performTest("Simple", 12, null, "empty.pass"); + performTest("Simple", 822, null, "empty.pass"); } public void testEmptyFileAfterTypingPackageIdAndSpace() throws Exception { - performTest("Empty", 0, "package test ", "empty.pass"); + performTest("Empty", 809, "package test ", "empty.pass"); } public void testAfterTypingPackageIdAndSpace() throws Exception { - performTest("SimpleNoPackage", 0, "package test ", "empty.pass"); + performTest("SimpleNoPackage", 809, "package test ", "empty.pass"); } public void testAfterPackageIdAndSpace() throws Exception { - performTest("Simple", 12, " ", "empty.pass"); + performTest("Simple", 822, " ", "empty.pass"); } public void testEmptyFileAfterTypingPackageDecl() throws Exception { - performTest("Empty", 0, "package test;", "topLevelKeywordsWithoutPackage.pass"); + performTest("Empty", 809, "package test;", "topLevelKeywordsWithoutPackage.pass"); } public void testAfterTypingPackageDecl() throws Exception { - performTest("SimpleNoPackage", 0, "package test;", "topLevelKeywordsWithoutPackage.pass"); + performTest("SimpleNoPackage", 809, "package test;", "topLevelKeywordsWithoutPackage.pass"); } public void testAfterPackageDecl() throws Exception { - performTest("Simple", 13, null, "topLevelKeywordsWithoutPackage.pass"); + performTest("Simple", 823, null, "topLevelKeywordsWithoutPackage.pass"); } // import declaration tests ------------------------------------------------ public void testEmptyFileAfterTypingImportKeyword() throws Exception { - performTest("Empty", 0, "import", "importKeyword.pass"); + performTest("Empty", 809, "import", "importKeyword.pass"); } public void testAfterTypingImportKeyword() throws Exception { - performTest("Simple", 14, "import", "importKeyword.pass"); + performTest("Simple", 824, "import", "importKeyword.pass"); } public void testAfterImportKeyword() throws Exception { - performTest("Import", 21, null, "importKeyword.pass"); + performTest("Import", 831, null, "importKeyword.pass"); } public void testEmptyFileBeforeTypingImportedPackage() throws Exception { - performTest("Empty", 0, "import ", "staticKeywordAndAllPackages.pass"); + performTest("Empty", 809, "import ", "staticKeywordAndAllPackages.pass"); } public void testBeforeTypingImportedPackage() throws Exception { - performTest("Simple", 14, "import ", "staticKeywordAndAllPackages.pass"); + performTest("Simple", 824, "import ", "staticKeywordAndAllPackages.pass"); } public void testBeforeImportedPackage() throws Exception { - performTest("Import", 22, null, "staticKeywordAndAllPackages.pass"); + performTest("Import", 832, null, "staticKeywordAndAllPackages.pass"); } public void testEmptyFileTypingImportedPackage() throws Exception { - performTest("Empty", 0, "import j", "packagesStartingWithJ.pass"); + performTest("Empty", 809, "import j", "packagesStartingWithJ.pass"); } public void testTypingImportedPackage() throws Exception { - performTest("Simple", 14, "import j", "packagesStartingWithJ.pass"); + performTest("Simple", 824, "import j", "packagesStartingWithJ.pass"); } public void testOnImportedPackage() throws Exception { - performTest("Import", 23, null, "packagesStartingWithJ.pass"); + performTest("Import", 833, null, "packagesStartingWithJ.pass"); } public void testEmptyFileTypingImportedPackageBeforeStar() throws Exception { - performTest("Empty", 0, "import java.util.", "javaUtilContent.pass"); + performTest("Empty", 809, "import java.util.", "javaUtilContent.pass"); } public void testTypingImportedPackageBeforeStar() throws Exception { - performTest("Simple", 14, "import java.util.", "javaUtilContent.pass"); + performTest("Simple", 824, "import java.util.", "javaUtilContent.pass"); } public void testOnImportedPackageBeforeStar() throws Exception { - performTest("Import", 54, null, "javaUtilContent.pass"); + performTest("Import", 864, null, "javaUtilContent.pass"); } public void testEmptyFileAfterTypingImportedPackage() throws Exception { - performTest("Empty", 0, "import java.util.*", "empty.pass"); + performTest("Empty", 809, "import java.util.*", "empty.pass"); } public void testAfterTypingImportedPackage() throws Exception { - performTest("Simple", 14, "import java.util.*", "empty.pass"); + performTest("Simple", 824, "import java.util.*", "empty.pass"); } public void testAfterImportedPackage() throws Exception { - performTest("Import", 55, null, "empty.pass"); + performTest("Import", 865, null, "empty.pass"); } public void testEmptyFileAfterTypingImportedClass() throws Exception { - performTest("Empty", 0, "import java.awt.List", "list.pass"); + performTest("Empty", 809, "import java.awt.List", "list.pass"); } public void testAfterTypingImportedClass() throws Exception { - performTest("Simple", 14, "import java.awt.List", "list.pass"); + performTest("Simple", 824, "import java.awt.List", "list.pass"); } public void testAfterImportedClass() throws Exception { - performTest("Import", 35, null, "list.pass"); + performTest("Import", 845, null, "list.pass"); } public void testEmptyFileAfterTypingImportedClassAndSpace() throws Exception { - performTest("Empty", 0, "import java.awt.List ", "empty.pass"); + performTest("Empty", 809, "import java.awt.List ", "empty.pass"); } public void testAfterTypingImportedClassAndSpace() throws Exception { - performTest("Simple", 14, "import java.awt.List ", "empty.pass"); + performTest("Simple", 824, "import java.awt.List ", "empty.pass"); } public void testAfterImportedClassAndSpace() throws Exception { - performTest("Import", 35, " ", "empty.pass"); + performTest("Import", 845, " ", "empty.pass"); } public void testEmptyFileAfterTypingImportStatement() throws Exception { - performTest("Empty", 0, "import java.awt.List;", "topLevelKeywordsWithoutPackage.pass"); + performTest("Empty", 809, "import java.awt.List;", "topLevelKeywordsWithoutPackage.pass"); } public void testAfterTypingImportStatement() throws Exception { - performTest("Simple", 14, "import java.awt.List;", "topLevelKeywordsWithoutPackage.pass"); + performTest("Simple", 824, "import java.awt.List;", "topLevelKeywordsWithoutPackage.pass"); } public void testAfterImportStatement() throws Exception { - performTest("Import", 36, null, "topLevelKeywordsWithoutPackage.pass"); + performTest("Import", 846, null, "topLevelKeywordsWithoutPackage.pass"); } public void testEmptyFileTypingStaticImportKeyword() throws Exception { - performTest("Empty", 0, "import st", "staticKeyword.pass"); + performTest("Empty", 809, "import st", "staticKeyword.pass"); } public void testTypingStaticImportKeyword() throws Exception { - performTest("Simple", 14, "import st", "staticKeyword.pass"); + performTest("Simple", 824, "import st", "staticKeyword.pass"); } public void testOnStaticImportKeyword() throws Exception { - performTest("Import", 66, null, "staticKeyword.pass"); + performTest("Import", 876, null, "staticKeyword.pass"); } public void testEmptyFileAfterTypingStaticImportKeyword() throws Exception { - performTest("Empty", 0, "import static", "staticKeyword.pass"); + performTest("Empty", 809, "import static", "staticKeyword.pass"); } public void testAfterTypingStaticImportKeyword() throws Exception { - performTest("Simple", 14, "import static", "staticKeyword.pass"); + performTest("Simple", 824, "import static", "staticKeyword.pass"); } public void testAfterStaticImportKeyword() throws Exception { - performTest("Import", 70, null, "staticKeyword.pass"); + performTest("Import", 880, null, "staticKeyword.pass"); } public void testEmptyFileBeforeTypingStaticallyImportedClass() throws Exception { - performTest("Empty", 0, "import static ", "allPackages.pass"); + performTest("Empty", 809, "import static ", "allPackages.pass"); } public void testBeforeTypingStaticallyImportedClass() throws Exception { - performTest("Simple", 14, "import static ", "allPackages.pass"); + performTest("Simple", 824, "import static ", "allPackages.pass"); } public void testBeforeStaticallyImportedClass() throws Exception { - performTest("Import", 71, null, "allPackages.pass"); + performTest("Import", 881, null, "allPackages.pass"); } public void testEmptyFileTypingImportedPackageAfterErrorInPackageDeclaration() throws Exception { - performTest("Empty", 0, "package \nimport j", "packagesStartingWithJ.pass"); + performTest("Empty", 809, "package \nimport j", "packagesStartingWithJ.pass"); } public void testTypingStaticImportAfterErrorInPackageDeclaration() throws Exception { - performTest("SimpleNoPackage", 0, "package \nimport ", "staticKeywordAndAllPackages.pass"); + performTest("SimpleNoPackage", 809, "package \nimport ", "staticKeywordAndAllPackages.pass"); } public void testTypingStaticImportAfterErrorInPreviousImportDeclaration() throws Exception { - performTest("Simple", 14, "im\nimport ", "staticKeywordAndAllPackages.pass"); + performTest("Simple", 824, "im\nimport ", "staticKeywordAndAllPackages.pass"); } // class declaration tests ------------------------------------------------- public void testEmptyFileAfterTypingPublicKeyword() throws Exception { - performTest("Empty", 0, "package test;\npublic", "publicKeyword.pass"); + performTest("Empty", 809, "package test;\npublic", "publicKeyword.pass"); } public void testAfterPublicKeyword() throws Exception { - performTest("Simple", 21, null, "publicKeyword.pass"); + performTest("Simple", 831, null, "publicKeyword.pass"); } public void testTypingFinalClass() throws Exception { - performTest("Simple", 21, " f", "finalKeyword.pass"); + performTest("Simple", 831, " f", "finalKeyword.pass"); } public void testAfterTypingFinalClass() throws Exception { - performTest("Simple", 21, " final", "finalKeyword.pass"); + performTest("Simple", 831, " final", "finalKeyword.pass"); } public void testEmptyFileBeforeTypingClassKeyword() throws Exception { - performTest("Empty", 0, "package test;\npublic ", "classModifiersWithoutPublic.pass"); + performTest("Empty", 809, "package test;\npublic ", "classModifiersWithoutPublic.pass"); } public void testBeforeClassKeyword() throws Exception { - performTest("Simple", 22, null, "classModifiersWithoutPublic.pass"); + performTest("Simple", 832, null, "classModifiersWithoutPublic.pass"); } public void testEmptyFileTypingClassKeyword() throws Exception { - performTest("Empty", 0, "package test;\npublic c", "classKeyword.pass"); + performTest("Empty", 809, "package test;\npublic c", "classKeyword.pass"); } public void testOnClassKeyword() throws Exception { - performTest("Simple", 23, null, "classKeyword.pass"); + performTest("Simple", 833, null, "classKeyword.pass"); } public void testEmptyFileAfterTypingClassKeyword() throws Exception { - performTest("Empty", 0, "package test;\npublic class", "classKeyword.pass"); + performTest("Empty", 809, "package test;\npublic class", "classKeyword.pass"); } public void testAfterClassKeyword() throws Exception { - performTest("Simple", 27, null, "classKeyword.pass"); + performTest("Simple", 837, null, "classKeyword.pass"); } public void testEmptyFileBeforeTypingClassName() throws Exception { - performTest("Empty", 0, "package test;\npublic class ", "empty.pass"); + performTest("Empty", 809, "package test;\npublic class ", "empty.pass"); } public void testBeforeClassName() throws Exception { - performTest("Simple", 28, null, "empty.pass"); + performTest("Simple", 838, null, "empty.pass"); } public void testEmptyFileTypingClassName() throws Exception { - performTest("Empty", 0, "package test;\npublic class T", "empty.pass"); + performTest("Empty", 809, "package test;\npublic class T", "empty.pass"); } public void testOnClassName() throws Exception { - performTest("Simple", 29, null, "empty.pass"); + performTest("Simple", 839, null, "empty.pass"); } public void testEmptyAfterFileTypingClassName() throws Exception { - performTest("Empty", 0, "package test;\npublic class Test", "empty.pass"); + performTest("Empty", 809, "package test;\npublic class Test", "empty.pass"); } public void testAfterClassName() throws Exception { - performTest("Simple", 32, null, "empty.pass"); + performTest("Simple", 842, null, "empty.pass"); } public void testEmptyFileBeforeTypingExtendsKeyword() throws Exception { - performTest("Empty", 0, "package test;\npublic class Test ", "extendsAndImplementsKeywords.pass"); + performTest("Empty", 809, "package test;\npublic class Test ", "extendsAndImplementsKeywords.pass"); } public void testBeforeTypingExtendsKeyword() throws Exception { - performTest("SimpleNoExtendsAndImplements", 33, null, "extendsAndImplementsKeywords.pass"); + performTest("SimpleNoExtendsAndImplements", 843, null, "extendsAndImplementsKeywords.pass"); } public void testBeforeExtendsKeyword() throws Exception { - performTest("Simple", 33, null, "extendsAndImplementsKeywords.pass"); + performTest("Simple", 843, null, "extendsAndImplementsKeywords.pass"); } public void testEmptyFileTypingExtendsKeyword() throws Exception { - performTest("Empty", 0, "package test;\npublic class Test e", "extendsKeyword.pass"); + performTest("Empty", 809, "package test;\npublic class Test e", "extendsKeyword.pass"); } public void testTypingExtendsKeyword() throws Exception { - performTest("SimpleNoExtendsAndImplements", 33, "e", "extendsKeyword.pass"); + performTest("SimpleNoExtendsAndImplements", 843, "e", "extendsKeyword.pass"); } public void testOnExtendsKeyword() throws Exception { - performTest("Simple", 34, null, "extendsKeyword.pass"); + performTest("Simple", 844, null, "extendsKeyword.pass"); } public void testEmptyFileAfterTypingExtendsKeyword() throws Exception { - performTest("Empty", 0, "package test;\npublic class Test extends", "extendsKeyword.pass"); + performTest("Empty", 809, "package test;\npublic class Test extends", "extendsKeyword.pass"); } public void testAfterTypingExtendsKeyword() throws Exception { - performTest("SimpleNoExtendsAndImplements", 33, "extends", "extendsKeyword.pass"); + performTest("SimpleNoExtendsAndImplements", 843, "extends", "extendsKeyword.pass"); } public void testAfterExtendsKeyword() throws Exception { - performTest("Simple", 40, null, "extendsKeyword.pass"); + performTest("Simple", 850, null, "extendsKeyword.pass"); } public void testEmptyFileBeforeTypingExtendedObject() throws Exception { - performTest("Empty", 0, "package test;\npublic class Test extends ", "javaLangClasses.pass"); + performTest("Empty", 809, "package test;\npublic class Test extends ", "javaLangClasses.pass"); } public void testBeforeTypingExtendedObject() throws Exception { - performTest("SimpleNoExtendsAndImplements", 33, "extends ", "javaLangClasses.pass"); + performTest("SimpleNoExtendsAndImplements", 843, "extends ", "javaLangClasses.pass"); } public void testBeforeExtendedObject() throws Exception { - performTest("Simple", 41, null, "javaLangClasses.pass"); + performTest("Simple", 851, null, "javaLangClasses.pass"); } public void testEmptyFileTypingExtendedObject() throws Exception { - performTest("Empty", 0, "package test;\npublic class Test extends O", "javaLangClassesStartingWithO.pass"); + performTest("Empty", 809, "package test;\npublic class Test extends O", "javaLangClassesStartingWithO.pass"); } public void testTypingExtendedObject() throws Exception { - performTest("SimpleNoExtendsAndImplements", 33, "extends O", "javaLangClassesStartingWithO.pass"); + performTest("SimpleNoExtendsAndImplements", 843, "extends O", "javaLangClassesStartingWithO.pass"); } public void testOnExtendedObject() throws Exception { - performTest("Simple", 42, null, "javaLangClassesStartingWithO.pass"); + performTest("Simple", 852, null, "javaLangClassesStartingWithO.pass"); } public void testEmptyFileAfterTypingExtendedObject() throws Exception { - performTest("Empty", 0, "package test;\npublic class Test extends Object", "object.pass"); + performTest("Empty", 809, "package test;\npublic class Test extends Object", "object.pass"); } public void testAfterTypingExtendedObject() throws Exception { - performTest("SimpleNoExtendsAndImplements", 33, "extends Object", "object.pass"); + performTest("SimpleNoExtendsAndImplements", 843, "extends Object", "object.pass"); } public void testAfterExtendedObject() throws Exception { - performTest("Simple", 47, null, "object.pass"); + performTest("Simple", 857, null, "object.pass"); } public void testEmptyFileBeforeTypingImplementsKeyword() throws Exception { - performTest("Empty", 0, "package test;\npublic class Test extends Object ", "implementsKeyword.pass"); + performTest("Empty", 809, "package test;\npublic class Test extends Object ", "implementsKeyword.pass"); } public void testBeforeTypingImplementsKeyword() throws Exception { - performTest("SimpleNoExtendsAndImplements", 33, "extends Object ", "implementsKeyword.pass"); + performTest("SimpleNoExtendsAndImplements", 843, "extends Object ", "implementsKeyword.pass"); } public void testBeforeImplementsKeyword() throws Exception { - performTest("Simple", 48, null, "implementsKeyword.pass"); + performTest("Simple", 858, null, "implementsKeyword.pass"); } public void testEmptyFileTypingImplementsKeyword() throws Exception { - performTest("Empty", 0, "package test;\npublic class Test extends Object i", "implementsKeyword.pass"); + performTest("Empty", 809, "package test;\npublic class Test extends Object i", "implementsKeyword.pass"); } public void testTypingImplementsKeyword() throws Exception { - performTest("SimpleNoExtendsAndImplements", 33, "i", "implementsKeyword.pass"); + performTest("SimpleNoExtendsAndImplements", 843, "i", "implementsKeyword.pass"); } public void testOnImplementsKeyword() throws Exception { - performTest("Simple", 49, null, "implementsKeyword.pass"); + performTest("Simple", 859, null, "implementsKeyword.pass"); } public void testEmptyFileAfteTypingImplementsKeyword() throws Exception { - performTest("Empty", 0, "package test;\npublic class Test extends Object implements", "implementsKeyword.pass"); + performTest("Empty", 809, "package test;\npublic class Test extends Object implements", "implementsKeyword.pass"); } public void testAfterTypingImplementsKeyword() throws Exception { - performTest("SimpleNoExtendsAndImplements", 33, "implements", "implementsKeyword.pass"); + performTest("SimpleNoExtendsAndImplements", 843, "implements", "implementsKeyword.pass"); } public void testAfterImplementsKeyword() throws Exception { - performTest("Simple", 58, null, "implementsKeyword.pass"); + performTest("Simple", 868, null, "implementsKeyword.pass"); } public void testEmptyFileBeforeTypingImplementedInterface() throws Exception { - performTest("Empty", 0, "package test;\npublic class Test extends Object implements ", "javaLangInterfaces.pass"); + performTest("Empty", 809, "package test;\npublic class Test extends Object implements ", "javaLangInterfaces.pass"); } public void testBeforeTypingImplementedInterface() throws Exception { - performTest("SimpleNoExtendsAndImplements", 33, "implements ", "javaLangInterfaces.pass"); + performTest("SimpleNoExtendsAndImplements", 843, "implements ", "javaLangInterfaces.pass"); } public void testBeforeImplementedInterface() throws Exception { - performTest("Simple", 59, null, "javaLangInterfaces.pass"); + performTest("Simple", 869, null, "javaLangInterfaces.pass"); } public void testEmptyFileAfterTypingImplementedInterface() throws Exception { - performTest("Empty", 0, "package test;\npublic class Test extends Object implements Cloneable", "cloneable.pass"); + performTest("Empty", 809, "package test;\npublic class Test extends Object implements Cloneable", "cloneable.pass"); } public void testAfterTypingImplementedInterface() throws Exception { - performTest("SimpleNoExtendsAndImplements", 33, "implements Cloneable", "cloneable.pass"); + performTest("SimpleNoExtendsAndImplements", 843, "implements Cloneable", "cloneable.pass"); } public void testAfterImplementedInterface() throws Exception { - performTest("Simple", 68, null, "cloneable.pass"); + performTest("Simple", 878, null, "cloneable.pass"); } public void testEmptyFileAfterTypingImplementedInterfaceAndSpace() throws Exception { - performTest("Empty", 0, "package test;\npublic class Test extends Object implements Cloneable ", "empty.pass"); + performTest("Empty", 809, "package test;\npublic class Test extends Object implements Cloneable ", "empty.pass"); } public void testAfterTypingImplementedInterfaceAndSpace() throws Exception { - performTest("SimpleNoExtendsAndImplements", 33, "implements Cloneable ", "empty.pass"); + performTest("SimpleNoExtendsAndImplements", 843, "implements Cloneable ", "empty.pass"); } public void testAfterImplementedInterfaceAndSpace() throws Exception { - performTest("Simple", 68, " ", "empty.pass"); + performTest("Simple", 878, " ", "empty.pass"); } public void testEmptyFileAfterTypingFirstImplementedInterface() throws Exception { - performTest("Empty", 0, "package test;\npublic class Test extends Object implements Cloneable, ", "javaLangInterfaces.pass"); + performTest("Empty", 809, "package test;\npublic class Test extends Object implements Cloneable, ", "javaLangInterfaces.pass"); } public void testAfterTypingFirstImplementedInterface() throws Exception { - performTest("SimpleNoExtendsAndImplements", 33, "implements Cloneable, ", "javaLangInterfaces.pass"); + performTest("SimpleNoExtendsAndImplements", 843, "implements Cloneable, ", "javaLangInterfaces.pass"); } public void testAfterFirstImplementedInterface() throws Exception { - performTest("Simple", 70, null, "javaLangInterfaces.pass"); + performTest("Simple", 880, null, "javaLangInterfaces.pass"); } public void testEmptyFileTypingSecondImplementedInterface() throws Exception { - performTest("Empty", 0, "package test;\npublic class Test extends Object implements Cloneable, R", "javaLangInterfacesStartingWithR.pass"); + performTest("Empty", 809, "package test;\npublic class Test extends Object implements Cloneable, R", "javaLangInterfacesStartingWithR.pass"); } public void testTypingSecondImplementedInterface() throws Exception { - performTest("SimpleNoExtendsAndImplements", 33, "implements Cloneable, R", "javaLangInterfacesStartingWithR.pass"); + performTest("SimpleNoExtendsAndImplements", 843, "implements Cloneable, R", "javaLangInterfacesStartingWithR.pass"); } public void testOnSecondImplementedInterface() throws Exception { - performTest("Simple", 71, null, "javaLangInterfacesStartingWithR.pass"); + performTest("Simple", 881, null, "javaLangInterfacesStartingWithR.pass"); } public void testEmptyFileTypingClassBody() throws Exception { - performTest("Empty", 0, "package test;\npublic class Test {", "memberModifiersTypesAndGenElements.pass"); + performTest("Empty", 809, "package test;\npublic class Test {", "memberModifiersTypesAndGenElements.pass"); } public void testInClassBody() throws Exception { - performTest("Simple", 80, null, "memberModifiersTypesAndGenElements2.pass"); + performTest("Simple", 890, null, "memberModifiersTypesAndGenElements2.pass"); } public void testEmptyFileAfterTypingClassBody() throws Exception { - performTest("Empty", 0, "package test;\npublic class Test {\n}", "classModifiersWithoutPublic.pass"); + performTest("Empty", 809, "package test;\npublic class Test {\n}", "classModifiersWithoutPublic.pass"); } public void testAfterClassBody() throws Exception { - performTest("Simple", 82, null, "classModifiersWithoutPublic.pass"); + performTest("Simple", 892, null, "classModifiersWithoutPublic.pass"); } public void testEmptyFileAfterTypingIncompleteClassBodyAndSecondClassKeyword() throws Exception { - performTest("Empty", 0, "package test;\npublic class Test {\nclass", "classKeyword.pass"); + performTest("Empty", 809, "package test;\npublic class Test {\nclass", "classKeyword.pass"); } // interface declaration tests --------------------------------------------- public void testEmptyFileAfterTypingIntefaceName() throws Exception { - performTest("Empty", 0, "package test;\ninterface Test ", "extendsKeyword.pass"); + performTest("Empty", 809, "package test;\ninterface Test ", "extendsKeyword.pass"); } public void testAfterTypingIntefaceName() throws Exception { - performTest("SimpleInterfaceNoExtends", 30, null, "extendsKeyword.pass"); + performTest("SimpleInterfaceNoExtends", 840, null, "extendsKeyword.pass"); } public void testAfterIntefaceName() throws Exception { - performTest("SimpleInterface", 30, null, "extendsKeyword.pass"); + performTest("SimpleInterface", 840, null, "extendsKeyword.pass"); } public void testEmptyFileAfterTypingExtendsInInteface() throws Exception { - performTest("Empty", 0, "package test;\ninterface Test extends ", "javaLangInterfaces.pass"); + performTest("Empty", 809, "package test;\ninterface Test extends ", "javaLangInterfaces.pass"); } public void testAfterTypingExtendsInInterface() throws Exception { - performTest("SimpleInterfaceNoExtends", 30, "extends ", "javaLangInterfaces.pass"); + performTest("SimpleInterfaceNoExtends", 840, "extends ", "javaLangInterfaces.pass"); } public void testAfterExtendsInInteface() throws Exception { - performTest("SimpleInterface", 38, null, "javaLangInterfaces.pass"); + performTest("SimpleInterface", 848, null, "javaLangInterfaces.pass"); } // enum declaration tests -------------------------------------------------- public void testEmptyFileAfterTypingEnumName() throws Exception { - performTest("Empty", 0, "package test;\npublic enum Test ", "implementsKeyword.pass"); + performTest("Empty", 809, "package test;\npublic enum Test ", "implementsKeyword.pass"); } public void testAfterTypingEnumName() throws Exception { - performTest("SimpleEnumNoImplements", 32, null, "implementsKeyword.pass"); + performTest("SimpleEnumNoImplements", 842, null, "implementsKeyword.pass"); } public void testAfterEnumName() throws Exception { - performTest("SimpleEnum", 32, null, "implementsKeyword.pass"); + performTest("SimpleEnum", 842, null, "implementsKeyword.pass"); } public void testEmptyFileAfterTypingImplementsInEnum() throws Exception { - performTest("Empty", 0, "package test;\npublic enum Test implements ", "javaLangInterfaces.pass"); + performTest("Empty", 809, "package test;\npublic enum Test implements ", "javaLangInterfaces.pass"); } public void testAfterTypingImplementsInEnum() throws Exception { - performTest("SimpleEnumNoImplements", 43, null, "javaLangInterfaces.pass"); + performTest("SimpleEnumNoImplements", 853, null, "javaLangInterfaces.pass"); } public void testAfterImplementsInEnum() throws Exception { - performTest("SimpleEnum", 43, null, "javaLangInterfaces.pass"); + performTest("SimpleEnum", 853, null, "javaLangInterfaces.pass"); } // method declaration tests ------------------------------------------------- public void testEmptyFileTypingPublicKeywordInMethodDecl() throws Exception { - performTest("MethodStart", 40, "p", "memberModifiersStartingWithP.pass"); + performTest("MethodStart", 850, "p", "memberModifiersStartingWithP.pass"); } public void testOnPublicKeywordInMethodDecl() throws Exception { - performTest("Method", 41, null, "memberModifiersStartingWithP.pass"); + performTest("Method", 851, null, "memberModifiersStartingWithP.pass"); } public void testEmptyFileAfterTypingPublicKeywordInMethodDecl() throws Exception { - performTest("MethodStart", 40, "public", "publicKeyword.pass"); + performTest("MethodStart", 850, "public", "publicKeyword.pass"); } public void testAfterPublicKeywordInMethodDecl() throws Exception { - performTest("Method", 46, null, "publicKeyword.pass"); + performTest("Method", 856, null, "publicKeyword.pass"); } public void testTypingStaticMethodDecl() throws Exception { - performTest("Method", 46, " sta", "staticKeyword.pass"); + performTest("Method", 856, " sta", "staticKeyword.pass"); } public void testAfterTypingStaticMethodDecl() throws Exception { - performTest("Method", 46, " static", "staticKeyword.pass"); + performTest("Method", 856, " static", "staticKeyword.pass"); } public void testEmptyFileBeforeTypingReturnValue() throws Exception { - performTest("MethodStart", 40, "public ", "memberModifiersAndTypesWithoutPublic.pass"); + performTest("MethodStart", 850, "public ", "memberModifiersAndTypesWithoutPublic.pass"); } public void testBeforeReturnValue() throws Exception { - performTest("Method", 47, null, "memberModifiersAndTypesWithoutPublic.pass"); + performTest("Method", 857, null, "memberModifiersAndTypesWithoutPublic.pass"); } public void testEmptyFileTypingReturnValue() throws Exception { - performTest("MethodStart", 40, "public voi", "voidKeyword.pass"); + performTest("MethodStart", 850, "public voi", "voidKeyword.pass"); } public void testOnReturnValue() throws Exception { - performTest("Method", 50, null, "voidKeyword.pass"); + performTest("Method", 860, null, "voidKeyword.pass"); } public void testEmptyFileAfterTypingReturnValue() throws Exception { - performTest("MethodStart", 40, "public void", "voidKeyword.pass"); + performTest("MethodStart", 850, "public void", "voidKeyword.pass"); } public void testAfterReturnValue() throws Exception { - performTest("Method", 51, null, "voidKeyword.pass"); + performTest("Method", 861, null, "voidKeyword.pass"); } public void testEmptyFileBeforeTypingMethodName() throws Exception { - performTest("MethodStart", 40, "public void ", "empty.pass"); + performTest("MethodStart", 850, "public void ", "empty.pass"); } public void testBeforeMethodName() throws Exception { - performTest("Method", 52, null, "empty.pass"); + performTest("Method", 862, null, "empty.pass"); } public void testEmptyFileTypingMethodName() throws Exception { - performTest("MethodStart", 40, "public void o", "empty.pass"); + performTest("MethodStart", 850, "public void o", "empty.pass"); } public void testOnMethodName() throws Exception { - performTest("Method", 53, null, "empty.pass"); + performTest("Method", 863, null, "empty.pass"); } public void testEmptyFileAfterTypingMethodName() throws Exception { - performTest("MethodStart", 40, "public void op", "empty.pass"); + performTest("MethodStart", 850, "public void op", "empty.pass"); } public void testAfterMethodName() throws Exception { - performTest("Method", 54, null, "empty.pass"); + performTest("Method", 864, null, "empty.pass"); } public void testEmptyFileBeforeTypingFirstParameter() throws Exception { - performTest("MethodStart", 40, "public void op(", "parameterTypes.pass"); + performTest("MethodStart", 850, "public void op(", "parameterTypes.pass"); } public void testBeforeTypingFirstParameter() throws Exception { - performTest("MethodNoParamsAndThrows", 55, null, "parameterTypes.pass"); + performTest("MethodNoParamsAndThrows", 865, null, "parameterTypes.pass"); } public void testBeforeFirstParameter() throws Exception { - performTest("Method", 55, null, "parameterTypes.pass"); + performTest("Method", 865, null, "parameterTypes.pass"); } public void testEmptyFileTypingFirstParameterType() throws Exception { - performTest("MethodStart", 40, "public void op(i", "intKeyword.pass"); + performTest("MethodStart", 850, "public void op(i", "intKeyword.pass"); } public void testTypingFirstParameterType() throws Exception { - performTest("MethodNoParamsAndThrows", 55, "i", "intKeyword.pass"); + performTest("MethodNoParamsAndThrows", 865, "i", "intKeyword.pass"); } public void testOnFirstParameterType() throws Exception { - performTest("Method", 56, null, "intKeyword.pass"); + performTest("Method", 866, null, "intKeyword.pass"); } public void testEmptyFileAfterTypingFirstParameterType() throws Exception { - performTest("MethodStart", 40, "public void op(int", "intKeyword.pass"); + performTest("MethodStart", 850, "public void op(int", "intKeyword.pass"); } public void testAfterTypingFirstParameterType() throws Exception { - performTest("MethodNoParamsAndThrows", 55, "int", "intKeyword.pass"); + performTest("MethodNoParamsAndThrows", 865, "int", "intKeyword.pass"); } public void testAfterFirstParameterType() throws Exception { - performTest("Method", 58, null, "intKeyword.pass"); + performTest("Method", 868, null, "intKeyword.pass"); } public void testEmptyFileBeforeTypingFirstParameterName() throws Exception { - performTest("MethodStart", 40, "public void op(int ", "intVarName.pass"); + performTest("MethodStart", 850, "public void op(int ", "intVarName.pass"); } public void testBeforeTypingFirstParameterName() throws Exception { - performTest("MethodNoParamsAndThrows", 55, "int ", "intVarName.pass"); + performTest("MethodNoParamsAndThrows", 865, "int ", "intVarName.pass"); } public void testBeforeFirstParameterName() throws Exception { - performTest("Method", 59, null, "intVarName.pass"); + performTest("Method", 869, null, "intVarName.pass"); } public void testEmptyFileTypingFirstParameterName() throws Exception { - performTest("MethodStart", 40, "public void op(int a", "empty.pass"); + performTest("MethodStart", 850, "public void op(int a", "empty.pass"); } public void testTypingFirstParameterName() throws Exception { - performTest("MethodNoParamsAndThrows", 55, "int a", "empty.pass"); + performTest("MethodNoParamsAndThrows", 865, "int a", "empty.pass"); } public void testOnFirstParameterName() throws Exception { - performTest("Method", 60, null, "empty.pass"); + performTest("Method", 870, null, "empty.pass"); } public void testEmptyFileAfterTypingFirstParameterNameAndSpace() throws Exception { - performTest("MethodStart", 40, "public void op(int a ", "empty.pass"); + performTest("MethodStart", 850, "public void op(int a ", "empty.pass"); } public void testAfterTypingFirstParameterNameAndSpace() throws Exception { - performTest("MethodNoParamsAndThrows", 55, "int a ", "empty.pass"); + performTest("MethodNoParamsAndThrows", 865, "int a ", "empty.pass"); } public void testAfterFirstParameterNameAndSpace() throws Exception { - performTest("Method", 60, " ", "empty.pass"); + performTest("Method", 870, " ", "empty.pass"); } public void testEmptyFileBeforeTypingSecondParameter() throws Exception { - performTest("MethodStart", 40, "public void op(int a,", "parameterTypes.pass"); + performTest("MethodStart", 850, "public void op(int a,", "parameterTypes.pass"); } public void testBeforeTypingSecondParameter() throws Exception { - performTest("MethodNoParamsAndThrows", 55, "int a,", "parameterTypes.pass"); + performTest("MethodNoParamsAndThrows", 865, "int a,", "parameterTypes.pass"); } public void testBeforeSecondParameter() throws Exception { - performTest("Method", 61, null, "parameterTypes.pass"); + performTest("Method", 871, null, "parameterTypes.pass"); } public void testEmptyFileTypingSecondParameterType() throws Exception { - performTest("MethodStart", 40, "public void op(int a, bo", "booleanKeyword.pass"); + performTest("MethodStart", 850, "public void op(int a, bo", "booleanKeyword.pass"); } public void testTypingSecondParameterType() throws Exception { - performTest("MethodNoParamsAndThrows", 55, "int a, bo", "booleanKeyword.pass"); + performTest("MethodNoParamsAndThrows", 865, "int a, bo", "booleanKeyword.pass"); } public void testOnSecondParameterType() throws Exception { - performTest("Method", 64, null, "booleanKeyword.pass"); + performTest("Method", 874, null, "booleanKeyword.pass"); } public void testEmptyFileAfterTypingSecondParameterType() throws Exception { - performTest("MethodStart", 40, "public void op(int a, boolean", "booleanKeyword.pass"); + performTest("MethodStart", 850, "public void op(int a, boolean", "booleanKeyword.pass"); } public void testAfterTypingSecondParameterType() throws Exception { - performTest("MethodNoParamsAndThrows", 55, "int a, boolean", "booleanKeyword.pass"); + performTest("MethodNoParamsAndThrows", 865, "int a, boolean", "booleanKeyword.pass"); } public void testAfterSecondParameterType() throws Exception { - performTest("Method", 69, null, "booleanKeyword.pass"); + performTest("Method", 879, null, "booleanKeyword.pass"); } public void testEmptyFileBeforeTypingSecondParameterName() throws Exception { - performTest("MethodStart", 40, "public void op(int a, boolean ", "booleanVarName.pass"); + performTest("MethodStart", 850, "public void op(int a, boolean ", "booleanVarName.pass"); } public void testBeforeTypingSecondParameterName() throws Exception { - performTest("MethodNoParamsAndThrows", 55, "int a, boolean ", "booleanVarName.pass"); + performTest("MethodNoParamsAndThrows", 865, "int a, boolean ", "booleanVarName.pass"); } public void testBeforeSecondParameterName() throws Exception { - performTest("Method", 70, null, "booleanVarName.pass"); + performTest("Method", 880, null, "booleanVarName.pass"); } public void testEmptyFileTypingSecondParameterName() throws Exception { - performTest("MethodStart", 40, "public void op(int a, boolean b", "booleanVarName.pass"); + performTest("MethodStart", 850, "public void op(int a, boolean b", "booleanVarName.pass"); } public void testTypingSecondParameterName() throws Exception { - performTest("MethodNoParamsAndThrows", 55, "int a, boolean b", "booleanVarName.pass"); + performTest("MethodNoParamsAndThrows", 865, "int a, boolean b", "booleanVarName.pass"); } public void testOnSecondParameterName() throws Exception { - performTest("Method", 71, null, "booleanVarName.pass"); + performTest("Method", 881, null, "booleanVarName.pass"); } public void testEmptyFileBeforeTypingThrowsKeyword() throws Exception { - performTest("MethodStart", 40, "public void op() ", "throwsKeyword.pass"); + performTest("MethodStart", 850, "public void op() ", "throwsKeyword.pass"); } public void testBeforeTypingThrowsKeyword() throws Exception { - performTest("MethodNoParamsAndThrows", 56, " ", "throwsKeyword.pass"); + performTest("MethodNoParamsAndThrows", 866, " ", "throwsKeyword.pass"); } public void testBeforeThrowsKeyword() throws Exception { - performTest("Method", 73, null, "throwsKeyword.pass"); + performTest("Method", 883, null, "throwsKeyword.pass"); } public void testEmptyFileTypingThrowsKeyword() throws Exception { - performTest("MethodStart", 40, "public void op() t", "throwsKeyword.pass"); + performTest("MethodStart", 850, "public void op() t", "throwsKeyword.pass"); } public void testTypingThrowsKeyword() throws Exception { - performTest("MethodNoParamsAndThrows", 56, " t", "throwsKeyword.pass"); + performTest("MethodNoParamsAndThrows", 866, " t", "throwsKeyword.pass"); } public void testOnThrowsKeyword() throws Exception { - performTest("Method", 74, null, "throwsKeyword.pass"); + performTest("Method", 884, null, "throwsKeyword.pass"); } public void testEmptyAfterFileTypingThrowsKeyword() throws Exception { - performTest("MethodStart", 40, "public void op() throws", "throwsKeyword.pass"); + performTest("MethodStart", 850, "public void op() throws", "throwsKeyword.pass"); } public void testAfterTypingThrowsKeyword() throws Exception { - performTest("MethodNoParamsAndThrows", 56, " throws", "throwsKeyword.pass"); + performTest("MethodNoParamsAndThrows", 866, " throws", "throwsKeyword.pass"); } public void testAfterThrowsKeyword() throws Exception { - performTest("Method", 79, null, "throwsKeyword.pass"); + performTest("Method", 889, null, "throwsKeyword.pass"); } public void testEmptyFileBeforeTypingThrownException() throws Exception { - performTest("MethodStart", 40, "public void op() throws ", "javaLangThrowables.pass"); + performTest("MethodStart", 850, "public void op() throws ", "javaLangThrowables.pass"); } public void testBeforeTypingThrownException() throws Exception { - performTest("MethodNoParamsAndThrows", 56, "throws ", "javaLangThrowables.pass"); + performTest("MethodNoParamsAndThrows", 866, "throws ", "javaLangThrowables.pass"); } public void testBeforeThrownException() throws Exception { - performTest("Method", 80, null, "javaLangThrowables.pass"); + performTest("Method", 890, null, "javaLangThrowables.pass"); } public void testEmptyFileTypingThrownException() throws Exception { - performTest("MethodStart", 40, "public void op() throws N", "javaLangThrowablesStartingWithN.pass"); + performTest("MethodStart", 850, "public void op() throws N", "javaLangThrowablesStartingWithN.pass"); } public void testTypingThrownException() throws Exception { - performTest("MethodNoParamsAndThrows", 56, "throws N", "javaLangThrowablesStartingWithN.pass"); + performTest("MethodNoParamsAndThrows", 866, "throws N", "javaLangThrowablesStartingWithN.pass"); } public void testOnThrownException() throws Exception { - performTest("Method", 81, null, "javaLangThrowablesStartingWithN.pass"); + performTest("Method", 891, null, "javaLangThrowablesStartingWithN.pass"); } public void testEmptyFileAfterTypingThrownException() throws Exception { - performTest("MethodStart", 40, "public void op() throws NullPointerException", "nullPointerException.pass"); + performTest("MethodStart", 850, "public void op() throws NullPointerException", "nullPointerException.pass"); } public void testAfterTypingThrownException() throws Exception { - performTest("MethodNoParamsAndThrows", 56, "throws NullPointerException", "nullPointerException.pass"); + performTest("MethodNoParamsAndThrows", 866, "throws NullPointerException", "nullPointerException.pass"); } public void testAfterThrownException() throws Exception { - performTest("Method", 100, null, "nullPointerException.pass"); + performTest("Method", 910, null, "nullPointerException.pass"); } public void testEmptyFileAfterTypingThrownExceptionAndSpace() throws Exception { - performTest("MethodStart", 40, "public void op() throws NullPointerException ", "empty.pass"); + performTest("MethodStart", 850, "public void op() throws NullPointerException ", "empty.pass"); } public void testAfterTypingThrownExceptionAndSpace() throws Exception { - performTest("MethodNoParamsAndThrows", 56, "throws NullPointerException ", "empty.pass"); + performTest("MethodNoParamsAndThrows", 866, "throws NullPointerException ", "empty.pass"); } public void testAfterThrownExceptionAndSpace() throws Exception { - performTest("Method", 100, " ", "empty.pass"); + performTest("Method", 910, " ", "empty.pass"); } public void testEmptyFileBeforeTypingSecondThrownException() throws Exception { - performTest("MethodStart", 40, "public void op() throws NullPointerException, ", "javaLangThrowables.pass"); + performTest("MethodStart", 850, "public void op() throws NullPointerException, ", "javaLangThrowables.pass"); } public void testBeforeTypingSecondThrownException() throws Exception { - performTest("MethodNoParamsAndThrows", 56, "throws NullPointerException, ", "javaLangThrowables.pass"); + performTest("MethodNoParamsAndThrows", 866, "throws NullPointerException, ", "javaLangThrowables.pass"); } public void testBeforeSecondThrownExceptionAndSpace() throws Exception { - performTest("Method", 102, null, "javaLangThrowables.pass"); + performTest("Method", 912, null, "javaLangThrowables.pass"); } public void testEmptyFileTypingSecondThrownException() throws Exception { - performTest("MethodStart", 40, "public void op() throws NullPointerException, I", "javaLangThrowablesStartingWithI.pass"); + performTest("MethodStart", 850, "public void op() throws NullPointerException, I", "javaLangThrowablesStartingWithI.pass"); } public void testTypingSecondThrownException() throws Exception { - performTest("MethodNoParamsAndThrows", 56, "throws NullPointerException, I", "javaLangThrowablesStartingWithI.pass"); + performTest("MethodNoParamsAndThrows", 866, "throws NullPointerException, I", "javaLangThrowablesStartingWithI.pass"); } public void testOnSecondThrownException() throws Exception { - performTest("Method", 103, null, "javaLangThrowablesStartingWithI.pass"); + performTest("Method", 913, null, "javaLangThrowablesStartingWithI.pass"); } public void testEmptyFileAfterTypingMethodBody() throws Exception { - performTest("MethodStart", 40, "public void op() {\n}", "memberModifiersTypesAndGenElements.pass"); + performTest("MethodStart", 850, "public void op() {\n}", "memberModifiersTypesAndGenElements.pass"); } public void testAfterMethodBody() throws Exception { - performTest("Method", 131, null, "memberModifiersTypesAndGenElements.pass"); + performTest("Method", 941, null, "memberModifiersTypesAndGenElements.pass"); } public void testEmptyFileAfterTypingIncompleteMethodBodyAndPublicKeyword() throws Exception { - performTest("MethodStart", 40, "public void op() {\npublic", "empty.pass"); + performTest("MethodStart", 850, "public void op() {\npublic", "empty.pass"); } public void testEmptyFileAfterTypingIncompleteMethodBodyAndPublicKeywordAndSpace() throws Exception { - performTest("MethodStart", 40, "public void op() {\npublic ", "memberModifiersAndTypesWithoutPublic.pass"); + performTest("MethodStart", 850, "public void op() {\npublic ", "memberModifiersAndTypesWithoutPublic.pass"); } // field declaration tests ------------------------------------------------- public void testEmptyFileAfterTypingFieldNameAndSpace() throws Exception { - performTest("MethodStart", 40, "public int field ", "empty.pass"); + performTest("MethodStart", 850, "public int field ", "empty.pass"); } public void testAfterTypingFieldNameAndSpace() throws Exception { - performTest("FieldNoInit", 56, " ", "empty.pass"); + performTest("FieldNoInit", 866, " ", "empty.pass"); } public void testAfterFieldNameAndSpace() throws Exception { - performTest("Field", 57, null, "empty.pass"); + performTest("Field", 867, null, "empty.pass"); } public void testEmptyFileAfterTypingAssignmentInField() throws Exception { - performTest("MethodStart", 40, "public static int staticField = 10;\npublic int field =", "typesLocalMembersAndSmartInt.pass"); + performTest("MethodStart", 850, "public static int staticField = 10;\npublic int field =", "typesLocalMembersAndSmartInt.pass"); } public void testAfterTypingAssignmentInField() throws Exception { - performTest("FieldNoInit", 56, " =", "typesLocalMembersAndSmartInt.pass"); + performTest("FieldNoInit", 866, " =", "typesLocalMembersAndSmartInt.pass"); } public void testAfterAssignmentInField() throws Exception { - performTest("Field", 58, null, "typesLocalMembersAndSmartInt.pass"); + performTest("Field", 868, null, "typesLocalMembersAndSmartInt.pass"); } public void testEmptyFileBeforeTypingInitOfField() throws Exception { - performTest("MethodStart", 40, "public static int staticField = 10;\npublic int field = ", "typesLocalMembersAndSmartInt.pass"); + performTest("MethodStart", 850, "public static int staticField = 10;\npublic int field = ", "typesLocalMembersAndSmartInt.pass"); } public void testBeforeTypingInitOfField() throws Exception { - performTest("FieldNoInit", 56, " = ", "typesLocalMembersAndSmartInt.pass"); + performTest("FieldNoInit", 866, " = ", "typesLocalMembersAndSmartInt.pass"); } public void testBeforeInitOfField() throws Exception { - performTest("Field", 59, null, "typesLocalMembersAndSmartInt.pass"); + performTest("Field", 869, null, "typesLocalMembersAndSmartInt.pass"); } public void testEmptyFileBeforeTypingInitOfStaticField() throws Exception { - performTest("MethodStart", 40, "public static int staticField = ", "typesAndStaticLocalMembers.pass"); + performTest("MethodStart", 850, "public static int staticField = ", "typesAndStaticLocalMembers.pass"); } public void testBeforeTypingInitOfStaticField() throws Exception { - performTest("FieldNoInit", 91, " = ", "typesAndStaticLocalMembers.pass"); + performTest("FieldNoInit", 901, " = ", "typesAndStaticLocalMembers.pass"); } public void testBeforeInitOfStaticField() throws Exception { - performTest("Field", 112, null, "typesAndStaticLocalMembers.pass"); + performTest("Field", 922, null, "typesAndStaticLocalMembers.pass"); } public void testEmptyFileTypingInitOfField() throws Exception { - performTest("MethodStart", 40, "public int field = ha", "intHashCode.pass"); + performTest("MethodStart", 850, "public int field = ha", "intHashCode.pass"); } public void testTypingInitOfField() throws Exception { - performTest("FieldNoInit", 56, " = ha", "intHashCode.pass"); + performTest("FieldNoInit", 866, " = ha", "intHashCode.pass"); } public void testOnInitOfField() throws Exception { - performTest("Field", 61, null, "intHashCode.pass"); + performTest("Field", 871, null, "intHashCode.pass"); } public void testEmptyFileTypingMethodInvocationWithinInitOfField() throws Exception { - performTest("MethodStart", 40, "public static int staticField = 10;\npublic int field = hashCode(", "typesAndLocalMembers.pass"); + performTest("MethodStart", 850, "public static int staticField = 10;\npublic int field = hashCode(", "typesAndLocalMembers.pass"); } public void testTypingMethodInvocationWithinInitOfField() throws Exception { - performTest("FieldNoInit", 56, " = hashCode(", "typesAndLocalMembers.pass"); + performTest("FieldNoInit", 866, " = hashCode(", "typesAndLocalMembers.pass"); } public void testOnMethodInvocationWithinInitOfField() throws Exception { - performTest("Field", 68, null, "typesAndLocalMembers.pass"); + performTest("Field", 878, null, "typesAndLocalMembers.pass"); } public void testEmptyFileAfterTypingMethodInvocationWithinInitOfField() throws Exception { - performTest("MethodStart", 40, "public int field = hashCode()", "empty.pass"); + performTest("MethodStart", 850, "public int field = hashCode()", "empty.pass"); } public void testAfterTypingMethodInvocationWithinInitOfField() throws Exception { - performTest("FieldNoInit", 56, " = hashCode()", "empty.pass"); + performTest("FieldNoInit", 866, " = hashCode()", "empty.pass"); } public void testAfterMethodInvocationWithinInitOfField() throws Exception { - performTest("Field", 69, null, "empty.pass"); + performTest("Field", 879, null, "empty.pass"); } public void testEmptyFileAfterTypingOperatorWithinInitOfField() throws Exception { - performTest("MethodStart", 40, "public static int staticField = 10;\npublic int field = hashCode() /", "typesLocalMembersAndSmartPrimitives.pass"); + performTest("MethodStart", 850, "public static int staticField = 10;\npublic int field = hashCode() /", "typesLocalMembersAndSmartPrimitives.pass"); } public void testAfterTypingOperatorWithinInitOfField() throws Exception { - performTest("FieldNoInit", 56, " = hashCode() /", "typesLocalMembersAndSmartPrimitives.pass"); + performTest("FieldNoInit", 866, " = hashCode() /", "typesLocalMembersAndSmartPrimitives.pass"); } public void testAfterOperatorWithinInitOfField() throws Exception { - performTest("Field", 71, null, "typesLocalMembersAndSmartPrimitives.pass"); + performTest("Field", 881, null, "typesLocalMembersAndSmartPrimitives.pass"); } public void testEmptyFileAfterTypingConstantWithinInitOfField() throws Exception { - performTest("MethodStart", 40, "public int field = hashCode() / 10", "empty.pass"); + performTest("MethodStart", 850, "public int field = hashCode() / 10", "empty.pass"); } public void testAfterTypingConstantWithinInitOfField() throws Exception { - performTest("FieldNoInit", 56, " = hashCode() / 10", "empty.pass"); + performTest("FieldNoInit", 866, " = hashCode() / 10", "empty.pass"); } public void testAfterConstantWithinInitOfField() throws Exception { - performTest("Field", 74, null, "empty.pass"); + performTest("Field", 884, null, "empty.pass"); } public void testEmptyFileAfterTypingFieldDeclaration() throws Exception { - performTest("MethodStart", 40, "public int field = hashCode() / 10;", "memberModifiersTypesAndGenElements3.pass"); + performTest("MethodStart", 850, "public int field = hashCode() / 10;", "memberModifiersTypesAndGenElements3.pass"); } public void testAfterFieldDeclaration() throws Exception { - performTest("Field", 75, null, "memberModifiersTypesAndGenElements4.pass"); + performTest("Field", 885, null, "memberModifiersTypesAndGenElements4.pass"); } public void testTypingStaticFieldAfterErrorInPreviousFieldDeclaration() throws Exception { - performTest("MethodStart", 40, "public int \npublic sta", "staticKeyword.pass"); + performTest("MethodStart", 850, "public int \npublic sta", "staticKeyword.pass"); } public void testTypingStaticFieldAfterErrorInPreviousFieldInitialization() throws Exception { - performTest("MethodStart", 40, "public int field = has\npublic sta", "staticKeyword.pass"); + performTest("MethodStart", 850, "public int field = has\npublic sta", "staticKeyword.pass"); } // basic method body tests ------------------------------------------------- public void testEmptyFileTypingMethodBody() throws Exception { - performTest("SimpleMethodBodyStart", 89, null, "methodBodyContent.pass"); + performTest("SimpleMethodBodyStart", 899, null, "methodBodyContent.pass"); } public void testTypingMethodBody() throws Exception { - performTest("SimpleEmptyMethodBody", 89, null, "methodBodyContent.pass"); + performTest("SimpleEmptyMethodBody", 899, null, "methodBodyContent.pass"); } public void testInMethodBody() throws Exception { - performTest("SimpleMethodBody", 89, null, "methodBodyContent.pass"); + performTest("SimpleMethodBody", 899, null, "methodBodyContent.pass"); } public void testEmptyFileTypingLocalVariableTypeInMethodBody() throws Exception { - performTest("SimpleMethodBodyStart", 98, "bo", "booleanKeyword.pass"); + performTest("SimpleMethodBodyStart", 908, "bo", "booleanKeyword.pass"); } public void testTypingLocalVariableTypeInMethodBody() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "bo", "booleanKeyword.pass"); + performTest("SimpleEmptyMethodBody", 908, "bo", "booleanKeyword.pass"); } public void testLocalVariableTypeInMethodBody() throws Exception { - performTest("SimpleMethodBody", 100, null, "booleanKeyword.pass"); + performTest("SimpleMethodBody", 910, null, "booleanKeyword.pass"); } public void testEmptyFileAfterTypingLocalVariableTypeInMethodBody() throws Exception { - performTest("SimpleMethodBodyStart", 98, "boolean", "booleanKeyword.pass"); + performTest("SimpleMethodBodyStart", 908, "boolean", "booleanKeyword.pass"); } public void testAfterTypingLocalVariableTypeInMethodBody() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "boolean", "booleanKeyword.pass"); + performTest("SimpleEmptyMethodBody", 908, "boolean", "booleanKeyword.pass"); } public void testAfterLocalVariableTypeInMethodBody() throws Exception { - performTest("SimpleMethodBody", 105, null, "booleanKeyword.pass"); + performTest("SimpleMethodBody", 915, null, "booleanKeyword.pass"); } public void testEmptyFileBeforeTypingLocalVariableNameInMethodBody() throws Exception { - performTest("SimpleMethodBodyStart", 98, "boolean ", "booleanVarName.pass"); + performTest("SimpleMethodBodyStart", 908, "boolean ", "booleanVarName.pass"); } public void testBeforeTypingLocalVariableNameInMethodBody() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "boolean ", "booleanVarName.pass"); + performTest("SimpleEmptyMethodBody", 908, "boolean ", "booleanVarName.pass"); } public void testBeforeLocalVariableNameInMethodBody() throws Exception { - performTest("SimpleMethodBody", 106, null, "booleanVarName.pass"); + performTest("SimpleMethodBody", 916, null, "booleanVarName.pass"); } public void testEmptyFileTypingLocalVariableNameInMethodBody() throws Exception { - performTest("SimpleMethodBodyStart", 98, "boolean b", "booleanVarName.pass"); + performTest("SimpleMethodBodyStart", 908, "boolean b", "booleanVarName.pass"); } public void testTypingLocalVariableNameInMethodBody() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "boolean b", "booleanVarName.pass"); + performTest("SimpleEmptyMethodBody", 908, "boolean b", "booleanVarName.pass"); } public void testOnLocalVariableNameInMethodBody() throws Exception { - performTest("SimpleMethodBody", 107, null, "booleanVarName.pass"); + performTest("SimpleMethodBody", 917, null, "booleanVarName.pass"); } public void testEmptyFileAfterTypingLocalVariableNameAndSpaceInMethodBody() throws Exception { - performTest("SimpleMethodBodyStart", 98, "boolean b ", "empty.pass"); + performTest("SimpleMethodBodyStart", 908, "boolean b ", "empty.pass"); } public void testAfterTypingLocalVariableNameAndSpaceInMethodBody() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "boolean b ", "empty.pass"); + performTest("SimpleEmptyMethodBody", 908, "boolean b ", "empty.pass"); } public void testAfterLocalVariableNameAndSpaceInMethodBody() throws Exception { - performTest("SimpleMethodBody", 107, " ", "empty.pass"); + performTest("SimpleMethodBody", 917, " ", "empty.pass"); } public void testEmptyFileAfterTypingLocalVariableInMethodBody() throws Exception { - performTest("SimpleMethodBodyStart", 98, "boolean b;", "methodBodyContentAndLocalVar.pass"); + performTest("SimpleMethodBodyStart", 908, "boolean b;", "methodBodyContentAndLocalVar.pass"); } public void testAfterTypingLocalVariableInMethodBody() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "boolean b;", "methodBodyContentAndLocalVar.pass"); + performTest("SimpleEmptyMethodBody", 908, "boolean b;", "methodBodyContentAndLocalVar.pass"); } public void testAfterLocalVariableInMethodBody() throws Exception { - performTest("SimpleMethodBody", 108, null, "methodBodyContentAndLocalVar.pass"); + performTest("SimpleMethodBody", 918, null, "methodBodyContentAndLocalVar.pass"); } public void testEmptyFileTypingTypeInMethodBody() throws Exception { - performTest("SimpleMethodBodyStart", 98, "Sy", "system.pass"); + performTest("SimpleMethodBodyStart", 908, "Sy", "system.pass"); } public void testTypingTypeInMethodBody() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "Sy", "system.pass"); + performTest("SimpleEmptyMethodBody", 908, "Sy", "system.pass"); } public void testTypeInMethodBody() throws Exception { - performTest("SimpleMethodBody", 112, null, "system.pass"); + performTest("SimpleMethodBody", 922, null, "system.pass"); } public void testEmptyFileAfterTypingTypeInMethodBody() throws Exception { - performTest("SimpleMethodBodyStart", 98, "System", "system.pass"); + performTest("SimpleMethodBodyStart", 908, "System", "system.pass"); } public void testAfterTypingTypeInMethodBody() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "System", "system.pass"); + performTest("SimpleEmptyMethodBody", 908, "System", "system.pass"); } public void testAfterTypeInMethodBody() throws Exception { - performTest("SimpleMethodBody", 116, null, "system.pass"); + performTest("SimpleMethodBody", 926, null, "system.pass"); } public void testEmptyFileAfterTypingTypeAndDotInMethodBody() throws Exception { - performTest("SimpleMethodBodyStart", 98, "System.", "systemContent.pass"); + performTest("SimpleMethodBodyStart", 908, "System.", "systemContent.pass"); } public void testAfterTypingTypeAndDotInMethodBody() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "System.", "systemContent.pass"); + performTest("SimpleEmptyMethodBody", 908, "System.", "systemContent.pass"); } public void testAfterTypeAndDotInMethodBody() throws Exception { - performTest("SimpleMethodBody", 117, null, "systemContent.pass"); + performTest("SimpleMethodBody", 927, null, "systemContent.pass"); } public void testEmptyFileTypingFieldAccessInMethodBody() throws Exception { - performTest("SimpleMethodBodyStart", 98, "System.o", "systemOut.pass"); + performTest("SimpleMethodBodyStart", 908, "System.o", "systemOut.pass"); } public void testTypingFieldAccessInMethodBody() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "System.o", "systemOut.pass"); + performTest("SimpleEmptyMethodBody", 908, "System.o", "systemOut.pass"); } public void testFieldAccessInMethodBody() throws Exception { - performTest("SimpleMethodBody", 118, null, "systemOut.pass"); + performTest("SimpleMethodBody", 928, null, "systemOut.pass"); } public void testEmptyFileAfterTypingFieldAccessInMethodBody() throws Exception { - performTest("SimpleMethodBodyStart", 98, "System.out", "systemOut.pass"); + performTest("SimpleMethodBodyStart", 908, "System.out", "systemOut.pass"); } public void testAfterTypingFieldAccessInMethodBody() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "System.out", "systemOut.pass"); + performTest("SimpleEmptyMethodBody", 908, "System.out", "systemOut.pass"); } public void testAfterFieldAccessInMethodBody() throws Exception { - performTest("SimpleMethodBody", 120, null, "systemOut.pass"); + performTest("SimpleMethodBody", 930, null, "systemOut.pass"); } public void testEmptyFileAfterTypingFieldAccessAndSpaceInMethodBody() throws Exception { - performTest("SimpleMethodBodyStart", 98, "System.out ", "instanceOf.pass"); + performTest("SimpleMethodBodyStart", 908, "System.out ", "instanceOf.pass"); } public void testAfterTypingFieldAccessAndSpaceInMethodBody() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "System.out ", "instanceOf.pass"); + performTest("SimpleEmptyMethodBody", 908, "System.out ", "instanceOf.pass"); } public void testAfterFieldAccessAndSpaceInMethodBody() throws Exception { - performTest("SimpleMethodBody", 120, " ", "instanceOf.pass"); + performTest("SimpleMethodBody", 930, " ", "instanceOf.pass"); } public void testEmptyFileAfterTypingFieldAccessAndDotInMethodBody() throws Exception { - performTest("SimpleMethodBodyStart", 98, "System.out.", "systemOutContent.pass"); + performTest("SimpleMethodBodyStart", 908, "System.out.", "systemOutContent.pass"); } public void testAfterTypingFieldAccessAndDotInMethodBody() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "System.out.", "systemOutContent.pass"); + performTest("SimpleEmptyMethodBody", 908, "System.out.", "systemOutContent.pass"); } public void testAfterFieldAccessAndDotInMethodBody() throws Exception { - performTest("SimpleMethodBody", 121, null, "systemOutContent.pass"); + performTest("SimpleMethodBody", 931, null, "systemOutContent.pass"); } public void testEmptyFileTypingMethodInvocationInMethodBody() throws Exception { - performTest("SimpleMethodBodyStart", 98, "boolean b;\nSystem.out.println(", "typesLocalMembersVarsAndSmarts.pass"); + performTest("SimpleMethodBodyStart", 908, "boolean b;\nSystem.out.println(", "typesLocalMembersVarsAndSmarts.pass"); } public void testTypingMethodInvocationInMethodBody() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "boolean b;\nSystem.out.println(", "typesLocalMembersVarsAndSmarts.pass"); + performTest("SimpleEmptyMethodBody", 908, "boolean b;\nSystem.out.println(", "typesLocalMembersVarsAndSmarts.pass"); } public void testMethodInvocationInMethodBody() throws Exception { - performTest("SimpleMethodBody", 129, null, "typesLocalMembersVarsAndSmarts.pass"); + performTest("SimpleMethodBody", 939, null, "typesLocalMembersVarsAndSmarts.pass"); } public void testEmptyFileTypingMethodInvocationParameterInMethodBody() throws Exception { - performTest("SimpleMethodBodyStart", 98, "boolean b;\nSystem.out.println(b", "typesLocalMembersVarsAndSmartsStartingWithB.pass"); + performTest("SimpleMethodBodyStart", 908, "boolean b;\nSystem.out.println(b", "typesLocalMembersVarsAndSmartsStartingWithB.pass"); } public void testTypingMethodInvocationParameterInMethodBody() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "boolean b;\nSystem.out.println(b", "typesLocalMembersVarsAndSmartsStartingWithB.pass"); + performTest("SimpleEmptyMethodBody", 908, "boolean b;\nSystem.out.println(b", "typesLocalMembersVarsAndSmartsStartingWithB.pass"); } public void testOnMethodInvocationParameterInMethodBody() throws Exception { - performTest("SimpleMethodBody", 130, null, "typesLocalMembersVarsAndSmartsStartingWithB.pass"); + performTest("SimpleMethodBody", 940, null, "typesLocalMembersVarsAndSmartsStartingWithB.pass"); } public void testEmptyFileTypingMethodInvocationParameterAndSpaceInMethodBody() throws Exception { - performTest("SimpleMethodBodyStart", 98, "System.out.println(b ", "empty.pass"); + performTest("SimpleMethodBodyStart", 908, "System.out.println(b ", "empty.pass"); } public void testTypingMethodInvocationParameterAndSpaceInMethodBody() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "System.out.println(b ", "empty.pass"); + performTest("SimpleEmptyMethodBody", 908, "System.out.println(b ", "empty.pass"); } public void testAfterMethodInvocationParameterAndSpaceInMethodBody() throws Exception { - performTest("SimpleMethodBody", 130, " ", "empty.pass"); + performTest("SimpleMethodBody", 940, " ", "empty.pass"); } public void testEmptyFileBeforeTypingSecondMethodInvocationParameterInMethodBody() throws Exception { - performTest("SimpleMethodBodyStart", 98, "boolean b;\nSystem.out.println(b, ", "typesLocalMembersAndVars.pass"); + performTest("SimpleMethodBodyStart", 908, "boolean b;\nSystem.out.println(b, ", "typesLocalMembersAndVars.pass"); } public void testBeforeTypingSecondMethodInvocationParameterInMethodBody() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "boolean b;\nSystem.out.println(b, ", "typesLocalMembersAndVars.pass"); + performTest("SimpleEmptyMethodBody", 908, "boolean b;\nSystem.out.println(b, ", "typesLocalMembersAndVars.pass"); } public void testBeforeSecondMethodInvocationParameterInMethodBody() throws Exception { - performTest("SimpleMethodBody", 130, ", ", "typesLocalMembersAndVars.pass"); + performTest("SimpleMethodBody", 940, ", ", "typesLocalMembersAndVars.pass"); } public void testEmptyFileTypingSecondMethodInvocationParameterInMethodBody() throws Exception { - performTest("SimpleMethodBodyStart", 98, "boolean b;\nSystem.out.println(b, b", "typesLocalMembersAndVarsStartingWithB.pass"); + performTest("SimpleMethodBodyStart", 908, "boolean b;\nSystem.out.println(b, b", "typesLocalMembersAndVarsStartingWithB.pass"); } public void testTypingSecondMethodInvocationParameterInMethodBody() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "boolean b;\nSystem.out.println(b, b", "typesLocalMembersAndVarsStartingWithB.pass"); + performTest("SimpleEmptyMethodBody", 908, "boolean b;\nSystem.out.println(b, b", "typesLocalMembersAndVarsStartingWithB.pass"); } public void testOnSecondMethodInvocationParameterInMethodBody() throws Exception { - performTest("SimpleMethodBody", 130, ", b", "typesLocalMembersAndVarsStartingWithB.pass"); + performTest("SimpleMethodBody", 940, ", b", "typesLocalMembersAndVarsStartingWithB.pass"); } public void testEmptyFileAfterTypingMethodInvocationParametersInMethodBody() throws Exception { - performTest("SimpleMethodBodyStart", 98, "boolean b;\nSystem.out.println(b)", "empty.pass"); + performTest("SimpleMethodBodyStart", 908, "boolean b;\nSystem.out.println(b)", "empty.pass"); } public void testAfterTypingMethodInvocationParametersInMethodBody() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "boolean b;\nSystem.out.println(b)", "empty.pass"); + performTest("SimpleEmptyMethodBody", 908, "boolean b;\nSystem.out.println(b)", "empty.pass"); } public void testAfteMethodInvocationParametersInMethodBody() throws Exception { - performTest("SimpleMethodBody", 131, null, "empty.pass"); + performTest("SimpleMethodBody", 941, null, "empty.pass"); } public void testEmptyFileAfterTypingMethodInvocationParametersAndSpaceInMethodBody() throws Exception { - performTest("SimpleMethodBodyStart", 98, "boolean b;\nSystem.out.println(b) ", "empty.pass"); + performTest("SimpleMethodBodyStart", 908, "boolean b;\nSystem.out.println(b) ", "empty.pass"); } public void testAfterTypingMethodInvocationParametersAndSpaceInMethodBody() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "boolean b;\nSystem.out.println(b) ", "empty.pass"); + performTest("SimpleEmptyMethodBody", 908, "boolean b;\nSystem.out.println(b) ", "empty.pass"); } public void testAfteMethodInvocationParametersAndSpaceInMethodBody() throws Exception { - performTest("SimpleMethodBody", 131, " ", "empty.pass"); + performTest("SimpleMethodBody", 941, " ", "empty.pass"); } public void testEmptyFileAfterTypingMethodInvocationInMethodBody() throws Exception { - performTest("SimpleMethodBodyStart", 98, "boolean b;\nSystem.out.println(b);", "methodBodyContentAndLocalVar.pass"); + performTest("SimpleMethodBodyStart", 908, "boolean b;\nSystem.out.println(b);", "methodBodyContentAndLocalVar.pass"); } public void testAfterTypingMethodInvocationInMethodBody() throws Exception { - performTest("SimpleEmptyMethodBody", 98, "boolean b;\nSystem.out.println(b);", "methodBodyContentAndLocalVar.pass"); + performTest("SimpleEmptyMethodBody", 908, "boolean b;\nSystem.out.println(b);", "methodBodyContentAndLocalVar.pass"); } public void testAfteMethodInvocationInMethodBody() throws Exception { - performTest("SimpleMethodBody", 132, null, "methodBodyContentAndLocalVar.pass"); + performTest("SimpleMethodBody", 942, null, "methodBodyContentAndLocalVar.pass"); } } diff --git a/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTaskElementCreatingTest.java b/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTaskElementCreatingTest.java index 771107df9..c079a0cc6 100644 --- a/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTaskElementCreatingTest.java +++ b/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTaskElementCreatingTest.java @@ -30,99 +30,99 @@ public JavaCompletionTaskElementCreatingTest(String testName) { } public void testUnimplementedMethod() throws Exception { - performTest("UnimplementedMethod", 85, "", "UnimplementedMethod.pass"); + performTest("UnimplementedMethod", 895, "", "UnimplementedMethod.pass"); } public void testOverrideAbstractList() throws Exception { - performTest("OverrideAbstractList", 118, "", "OverrideAbstractList.pass"); + performTest("OverrideAbstractList", 928, "", "OverrideAbstractList.pass"); } /** * Checks that cc: offers just one size() for override, but offers size() for both implement AND override. */ public void testOverrideAbstractListAbstract() throws Exception { - performTest("OverrideAbstractListAbstract", 126, "", "OverrideAbstractListAbstract.pass"); + performTest("OverrideAbstractListAbstract", 936, "", "OverrideAbstractListAbstract.pass"); } /** CC should not offer overriding private method from superclass */ public void testOverridePrivateMethod() throws Exception { - performTest("OverridePrivateMethod", 89, "cl", "OverridePrivateMethod.pass"); + performTest("OverridePrivateMethod", 899, "cl", "OverridePrivateMethod.pass"); } /** CC should not offer overriding package private method from superclass in a different package */ public void testOverridePackagePrivateMethod() throws Exception { - performTest("OverridePackagePrivateMethod", 108, "add", "OverridePackagePrivateMethod.pass"); + performTest("OverridePackagePrivateMethod", 918, "add", "OverridePackagePrivateMethod.pass"); } public void testOverrideAbstractListWithPrefix() throws Exception { - performTest("OverrideAbstractList", 118, "to", "OverrideAbstractListWithPrefix.pass"); + performTest("OverrideAbstractList", 928, "to", "OverrideAbstractListWithPrefix.pass"); } public void testOverrideFinalize() throws Exception { - performTest("OverrideAbstractList", 118, "fin", "OverrideFinalize.pass"); + performTest("OverrideAbstractList", 928, "fin", "OverrideFinalize.pass"); } public void testOverrideAbstractList2a() throws Exception { - performTest("OverrideAbstractList2", 139, "ad", "OverrideAbstractList2a.pass"); + performTest("OverrideAbstractList2", 949, "ad", "OverrideAbstractList2a.pass"); } public void testOverrideAbstractList2b() throws Exception { - performTest("OverrideAbstractList2", 139, "ge", "OverrideAbstractList2b.pass"); + performTest("OverrideAbstractList2", 949, "ge", "OverrideAbstractList2b.pass"); } public void testOverrideAbstractList3a() throws Exception { - performTest("OverrideAbstractList3", 126, "ad", "OverrideAbstractList3a.pass"); + performTest("OverrideAbstractList3", 936, "ad", "OverrideAbstractList3a.pass"); } public void testOverrideAbstractList3b() throws Exception { - performTest("OverrideAbstractList3", 126, "ge", "OverrideAbstractList3b.pass"); + performTest("OverrideAbstractList3", 936, "ge", "OverrideAbstractList3b.pass"); } public void testOverrideTypedException1() throws Exception { - performTest("OverrideTypedException", 209, "tes", "OverrideTypedException.pass"); + performTest("OverrideTypedException", 1019, "tes", "OverrideTypedException.pass"); } public void testOverrideTypedException2() throws Exception { - performTest("OverrideTypedException", 305, "tes", "OverrideTypedException.pass"); + performTest("OverrideTypedException", 1115, "tes", "OverrideTypedException.pass"); } public void testOverrideInInnerClass() throws Exception { - performTest("OverrideInInnerClass", 185, "pai", "OverrideInInnerClass.pass"); + performTest("OverrideInInnerClass", 995, "pai", "OverrideInInnerClass.pass"); } public void testOverrideInInnerClassUnresolvable() throws Exception { - performTest("OverrideInInnerClassUnresolvable", 157, "pai", "empty.pass"); + performTest("OverrideInInnerClassUnresolvable", 967, "pai", "empty.pass"); } public void testCreateConstructorTest() throws Exception { - performTest("CreateConstructorTest", 249, "", "CreateConstructorTest.pass"); + performTest("CreateConstructorTest", 1059, "", "CreateConstructorTest.pass"); } public void testCreateConstructorTestInnerClass() throws Exception { - performTest("CreateConstructorTest", 434, "", "CreateConstructorTestInnerClass.pass"); + performTest("CreateConstructorTest", 1244, "", "CreateConstructorTestInnerClass.pass"); } public void testCreateConstructorWithConstructors() throws Exception { - performTest("CreateConstructorWithConstructors", 400, "", "CreateConstructorWithConstructors.pass"); + performTest("CreateConstructorWithConstructors", 1210, "", "CreateConstructorWithConstructors.pass"); } public void testCreateConstructorWithConstructorsInnerClass() throws Exception { - performTest("CreateConstructorWithConstructors", 667, "", "CreateConstructorWithConstructorsInnerClass.pass"); + performTest("CreateConstructorWithConstructors", 1477, "", "CreateConstructorWithConstructorsInnerClass.pass"); } public void testCreateConstructorWithDefaultConstructor() throws Exception { - performTest("CreateConstructorWithDefaultConstructor", 352, "", "CreateConstructorWithDefaultConstructor.pass"); + performTest("CreateConstructorWithDefaultConstructor", 1162, "", "CreateConstructorWithDefaultConstructor.pass"); } public void testCreateConstructorWithDefaultConstructorInnerClass() throws Exception { - performTest("CreateConstructorWithDefaultConstructor", 560, "", "CreateConstructorWithDefaultConstructorInnerClass.pass"); + performTest("CreateConstructorWithDefaultConstructor", 1370, "", "CreateConstructorWithDefaultConstructorInnerClass.pass"); } public void testCreateConstructorNonDefaultConstructor() throws Exception { - performTest("CreateConstructorNonDefaultConstructor", 379, "", "CreateConstructorNonDefaultConstructor.pass"); + performTest("CreateConstructorNonDefaultConstructor", 1189, "", "CreateConstructorNonDefaultConstructor.pass"); } public void testCreateConstructorNonDefaultConstructorInnerClass() throws Exception { - performTest("CreateConstructorNonDefaultConstructor", 624, "", "CreateConstructorNonDefaultConstructorInnerClass.pass"); + performTest("CreateConstructorNonDefaultConstructor", 1434, "", "CreateConstructorNonDefaultConstructorInnerClass.pass"); } } diff --git a/java.editor/test/qa-functional/data/CC15Tests/build.xml b/java.editor/test/qa-functional/data/CC15Tests/build.xml index 776432097..4933ba062 100644 --- a/java.editor/test/qa-functional/data/CC15Tests/build.xml +++ b/java.editor/test/qa-functional/data/CC15Tests/build.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- You may freely edit this file. See commented blocks below for --> <!-- some examples of how to customize the build. --> <!-- (If you delete it and reopen the project it will be recreated.) --> diff --git a/java.editor/test/qa-functional/data/CC15Tests/nbproject/project.properties b/java.editor/test/qa-functional/data/CC15Tests/nbproject/project.properties index f9123fbd4..365d7fcf0 100644 --- a/java.editor/test/qa-functional/data/CC15Tests/nbproject/project.properties +++ b/java.editor/test/qa-functional/data/CC15Tests/nbproject/project.properties @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + application.args= build.classes.dir=${build.dir}/classes build.classes.excludes=**/*.java,**/*.form diff --git a/java.editor/test/qa-functional/data/CC15Tests/nbproject/project.xml b/java.editor/test/qa-functional/data/CC15Tests/nbproject/project.xml index 5a1791100..e07421e18 100644 --- a/java.editor/test/qa-functional/data/CC15Tests/nbproject/project.xml +++ b/java.editor/test/qa-functional/data/CC15Tests/nbproject/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.java.j2seproject</type> <configuration> diff --git a/java.editor/test/qa-functional/data/cp-prj-1/build.xml b/java.editor/test/qa-functional/data/cp-prj-1/build.xml index 1f2528558..d7db0213d 100644 --- a/java.editor/test/qa-functional/data/cp-prj-1/build.xml +++ b/java.editor/test/qa-functional/data/cp-prj-1/build.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- You may freely edit this file. See commented blocks below for --> <!-- some examples of how to customize the build. --> <!-- (If you delete it and reopen the project it will be recreated.) --> diff --git a/java.editor/test/qa-functional/data/cp-prj-1/nbproject/project.properties b/java.editor/test/qa-functional/data/cp-prj-1/nbproject/project.properties index e0e106e44..4e33cee6c 100644 --- a/java.editor/test/qa-functional/data/cp-prj-1/nbproject/project.properties +++ b/java.editor/test/qa-functional/data/cp-prj-1/nbproject/project.properties @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + application.args= build.classes.dir=${build.dir}/classes build.classes.excludes=**/*.java,**/*.form diff --git a/java.editor/test/qa-functional/data/cp-prj-1/nbproject/project.xml b/java.editor/test/qa-functional/data/cp-prj-1/nbproject/project.xml index 43c9eeefc..733578c32 100644 --- a/java.editor/test/qa-functional/data/cp-prj-1/nbproject/project.xml +++ b/java.editor/test/qa-functional/data/cp-prj-1/nbproject/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.java.j2seproject</type> <configuration> diff --git a/java.editor/test/qa-functional/data/projects/Formatting/build.xml b/java.editor/test/qa-functional/data/projects/Formatting/build.xml index 481f315a6..46ad2eeb0 100644 --- a/java.editor/test/qa-functional/data/projects/Formatting/build.xml +++ b/java.editor/test/qa-functional/data/projects/Formatting/build.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- You may freely edit this file. See commented blocks below for --> <!-- some examples of how to customize the build. --> <!-- (If you delete it and reopen the project it will be recreated.) --> diff --git a/java.editor/test/qa-functional/data/projects/Formatting/nbproject/project.properties b/java.editor/test/qa-functional/data/projects/Formatting/nbproject/project.properties index 8fddb58a6..5cd75225f 100644 --- a/java.editor/test/qa-functional/data/projects/Formatting/nbproject/project.properties +++ b/java.editor/test/qa-functional/data/projects/Formatting/nbproject/project.properties @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + annotation.processing.enabled=true annotation.processing.enabled.in.editor=false annotation.processing.processors.list= diff --git a/java.editor/test/qa-functional/data/projects/Formatting/nbproject/project.xml b/java.editor/test/qa-functional/data/projects/Formatting/nbproject/project.xml index 0c024d660..ec646aa73 100644 --- a/java.editor/test/qa-functional/data/projects/Formatting/nbproject/project.xml +++ b/java.editor/test/qa-functional/data/projects/Formatting/nbproject/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.java.j2seproject</type> <configuration> diff --git a/java.editor/test/qa-functional/data/projects/java_editor_test/build.xml b/java.editor/test/qa-functional/data/projects/java_editor_test/build.xml index 79bfd327e..1e0f71e85 100644 --- a/java.editor/test/qa-functional/data/projects/java_editor_test/build.xml +++ b/java.editor/test/qa-functional/data/projects/java_editor_test/build.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- You may freely edit this file. See commented blocks below for --> <!-- some examples of how to customize the build. --> <!-- (If you delete it and reopen the project it will be recreated.) --> diff --git a/java.editor/test/qa-functional/data/projects/java_editor_test/nbproject/project.properties b/java.editor/test/qa-functional/data/projects/java_editor_test/nbproject/project.properties index 46e5a06e4..a09f70203 100644 --- a/java.editor/test/qa-functional/data/projects/java_editor_test/nbproject/project.properties +++ b/java.editor/test/qa-functional/data/projects/java_editor_test/nbproject/project.properties @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + application.args= build.classes.dir=${build.dir}/classes build.classes.excludes=**/*.java,**/*.form diff --git a/java.editor/test/qa-functional/data/projects/java_editor_test/nbproject/project.xml b/java.editor/test/qa-functional/data/projects/java_editor_test/nbproject/project.xml index 52765dbb0..1ae225f57 100644 --- a/java.editor/test/qa-functional/data/projects/java_editor_test/nbproject/project.xml +++ b/java.editor/test/qa-functional/data/projects/java_editor_test/nbproject/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.java.j2seproject</type> <configuration> diff --git a/java.editor/test/qa-functional/src/org/netbeans/test/java/editor/completion/config.cfg b/java.editor/test/qa-functional/src/org/netbeans/test/java/editor/completion/config.cfg index 608513d10..06ec0483d 100644 --- a/java.editor/test/qa-functional/src/org/netbeans/test/java/editor/completion/config.cfg +++ b/java.editor/test/qa-functional/src/org/netbeans/test/java/editor/completion/config.cfg @@ -1,45 +1,19 @@ -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -# -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. -# -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# Contributor(s): -# -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. # #The file format is as follows: #test name:code to insert:whether to sort result:golden file to use (@ goldenfile according to name):project to open:which file to open:line to jump diff --git a/java.editor/test/qa-functional/src/org/netbeans/test/java/editor/completion/create b/java.editor/test/qa-functional/src/org/netbeans/test/java/editor/completion/create index 7f538e7a6..5d635aed8 100644 --- a/java.editor/test/qa-functional/src/org/netbeans/test/java/editor/completion/create +++ b/java.editor/test/qa-functional/src/org/netbeans/test/java/editor/completion/create @@ -52,17 +52,23 @@ go() touch $output; cat >>$output <<END_OF_SOURCE //This class is automatically generated - DO NOT MODIFY (ever) -/* - * Sun Public License Notice - * - * The contents of this file are subject to the Sun Public License - * Version 1.0 (the "License"). You may not use this file except in - * compliance with the License. A copy of the License is available at - * http://www.sun.com/ - * - * The Original Code is NetBeans. The Initial Developer of the Original - * Code is Sun Microsystems, Inc. Portions Copyright 1997-2001 Sun - * Microsystems, Inc. All Rights Reserved. +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.netbeans.test.java.editor.completion; import java.io.PrintWriter; diff --git a/java.examples/l10n.list b/java.examples/l10n.list index 9e23b8432..1c36c9354 100644 --- a/java.examples/l10n.list +++ b/java.examples/l10n.list @@ -1,2 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# # usersguide/j2seexamples read global diff --git a/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/queries/Bundle.properties b/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/queries/Bundle.properties index a6a660808..336b8df85 100644 --- a/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/queries/Bundle.properties +++ b/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/queries/Bundle.properties @@ -1,40 +1,20 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved. +# http://www.apache.org/licenses/LICENSE-2.0 # -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. # -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. -# -# Contributor(s): # {0} - the root to attach Javadoc to TXT_AttachJavadocTo=Attach Javadoc to "{0}" # {0} - the root to attach Sources to diff --git a/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/resources/templates/defaultPlatform.xml b/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/resources/templates/defaultPlatform.xml index 3a87e2779..bf0172dd8 100644 --- a/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/resources/templates/defaultPlatform.xml +++ b/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/resources/templates/defaultPlatform.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!DOCTYPE platform PUBLIC '-//NetBeans//DTD Java PlatformDefinition 1.0//EN' 'http://www.netbeans.org/dtds/java-platformdefinition-1_0.dtd'> <platform default="yes"> </platform> diff --git a/java.j2seproject/l10n.list b/java.j2seproject/l10n.list index 90d2c4179..5a97fe280 100644 --- a/java.j2seproject/l10n.list +++ b/java.j2seproject/l10n.list @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# # java/j2seproject read global # include copylibstask submodule diff --git a/java.j2seproject/test/unit/src/META-INF/services/org.apache.tools.ant.module.spi.AntLogger b/java.j2seproject/test/unit/src/META-INF/services/org.apache.tools.ant.module.spi.AntLogger index a3675acb2..280fe9ea6 100644 --- a/java.j2seproject/test/unit/src/META-INF/services/org.apache.tools.ant.module.spi.AntLogger +++ b/java.j2seproject/test/unit/src/META-INF/services/org.apache.tools.ant.module.spi.AntLogger @@ -1 +1,18 @@ -#-org.netbeans.modules.junit.output.JUnitAntLogger +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#-org.netbeans.modules.junit.output.JUnitAntLogger \ No newline at end of file diff --git a/java.project.ui/test/unit/data/simple-app/build.xml b/java.project.ui/test/unit/data/simple-app/build.xml index 04ab4be52..2a2d38a54 100644 --- a/java.project.ui/test/unit/data/simple-app/build.xml +++ b/java.project.ui/test/unit/data/simple-app/build.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- You may freely edit this file. See commented blocks below for --> <!-- some examples of how to customize the build. --> <!-- (If you delete it and reopen the project it will be recreated.) --> diff --git a/java.project.ui/test/unit/data/simple-app/nbproject/project.properties b/java.project.ui/test/unit/data/simple-app/nbproject/project.properties index 870bb245f..83924376b 100644 --- a/java.project.ui/test/unit/data/simple-app/nbproject/project.properties +++ b/java.project.ui/test/unit/data/simple-app/nbproject/project.properties @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + application.args= build.classes.dir=${build.dir}/classes build.classes.excludes=**/*.java,**/*.form diff --git a/java.source.base/nbproject/project.properties b/java.source.base/nbproject/project.properties index 85952e9d2..1e5933bb0 100644 --- a/java.source.base/nbproject/project.properties +++ b/java.source.base/nbproject/project.properties @@ -1,44 +1,20 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. +# http://www.apache.org/licenses/LICENSE-2.0 # -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# Contributor(s): -# -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 1997-2010 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + #javac.compilerargs=-Xlint:unchecked nbroot=../.. is.autoload=true diff --git a/java.source/nbproject/project.properties b/java.source/nbproject/project.properties index 510f6c357..0bd7f9794 100644 --- a/java.source/nbproject/project.properties +++ b/java.source/nbproject/project.properties @@ -1,44 +1,20 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. +# http://www.apache.org/licenses/LICENSE-2.0 # -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# Contributor(s): -# -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 1997-2010 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + #javac.compilerargs=-Xlint:unchecked nbroot=../.. javac.source=1.8 diff --git a/java.source/test/qa-functional/data/projects/default/build.xml b/java.source/test/qa-functional/data/projects/default/build.xml index a48d6ba24..5b31ada81 100644 --- a/java.source/test/qa-functional/data/projects/default/build.xml +++ b/java.source/test/qa-functional/data/projects/default/build.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- You may freely edit this file. See commented blocks below for --> <!-- some examples of how to customize the build. --> <!-- (If you delete it and reopen the project it will be recreated.) --> diff --git a/java.source/test/qa-functional/data/projects/default/nbproject/project.properties b/java.source/test/qa-functional/data/projects/default/nbproject/project.properties index f2c612177..1824a07e2 100644 --- a/java.source/test/qa-functional/data/projects/default/nbproject/project.properties +++ b/java.source/test/qa-functional/data/projects/default/nbproject/project.properties @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + annotation.processing.enabled=true annotation.processing.enabled.in.editor=false annotation.processing.processors.list= diff --git a/java.source/test/qa-functional/data/projects/default/nbproject/project.xml b/java.source/test/qa-functional/data/projects/default/nbproject/project.xml index d3cdc2265..eca9a34b2 100644 --- a/java.source/test/qa-functional/data/projects/default/nbproject/project.xml +++ b/java.source/test/qa-functional/data/projects/default/nbproject/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.java.j2seproject</type> <configuration> diff --git a/javafx2.editor/test/unit/data/org/netbeans/modules/javafx2/editor/actions/FieldsWithTypeParams.java b/javafx2.editor/test/unit/data/org/netbeans/modules/javafx2/editor/actions/FieldsWithTypeParams.java index 5d67e7bac..9239c3d9c 100644 --- a/javafx2.editor/test/unit/data/org/netbeans/modules/javafx2/editor/actions/FieldsWithTypeParams.java +++ b/javafx2.editor/test/unit/data/org/netbeans/modules/javafx2/editor/actions/FieldsWithTypeParams.java @@ -1,4 +1,21 @@ - +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.netbeans.modules.javafx2.editor.actions; import java.util.HashMap; diff --git a/javafx2.samples/AdvancedMedia/nbproject/genfiles.properties b/javafx2.samples/AdvancedMedia/nbproject/genfiles.properties index 71e45ee7f..c43ae2630 100644 --- a/javafx2.samples/AdvancedMedia/nbproject/genfiles.properties +++ b/javafx2.samples/AdvancedMedia/nbproject/genfiles.properties @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. build.xml.data.CRC32=74871d7d build.xml.script.CRC32=78c129cf build.xml.stylesheet.CRC32=28e38971@1.50.0.46 diff --git a/javafx2.samples/AdvancedMedia/nbproject/jfx-impl.xml b/javafx2.samples/AdvancedMedia/nbproject/jfx-impl.xml index df73304cf..bc99a7944 100644 --- a/javafx2.samples/AdvancedMedia/nbproject/jfx-impl.xml +++ b/javafx2.samples/AdvancedMedia/nbproject/jfx-impl.xml @@ -1,5 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<!-- *** GENERATED FROM TEMPLATE - DO NOT EDIT *** *** EDIT ../build.xml INSTEAD *** --> diff --git a/javafx2.samples/AudioVisualizer3D/nbproject/genfiles.properties b/javafx2.samples/AudioVisualizer3D/nbproject/genfiles.properties index d8b39fbbf..b3103b67d 100644 --- a/javafx2.samples/AudioVisualizer3D/nbproject/genfiles.properties +++ b/javafx2.samples/AudioVisualizer3D/nbproject/genfiles.properties @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. build.xml.data.CRC32=28fc8bbb build.xml.script.CRC32=4fcccc57 build.xml.stylesheet.CRC32=28e38971@1.50.0.46 diff --git a/javafx2.samples/AudioVisualizer3D/nbproject/jfx-impl.xml b/javafx2.samples/AudioVisualizer3D/nbproject/jfx-impl.xml index df73304cf..bc99a7944 100644 --- a/javafx2.samples/AudioVisualizer3D/nbproject/jfx-impl.xml +++ b/javafx2.samples/AudioVisualizer3D/nbproject/jfx-impl.xml @@ -1,5 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<!-- *** GENERATED FROM TEMPLATE - DO NOT EDIT *** *** EDIT ../build.xml INSTEAD *** --> diff --git a/javafx2.samples/BrickBreaker/nbproject/genfiles.properties b/javafx2.samples/BrickBreaker/nbproject/genfiles.properties index ff3dc9b9e..5206a8841 100644 --- a/javafx2.samples/BrickBreaker/nbproject/genfiles.properties +++ b/javafx2.samples/BrickBreaker/nbproject/genfiles.properties @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. build.xml.data.CRC32=87aa9f6e build.xml.script.CRC32=8149aaba build.xml.stylesheet.CRC32=28e38971@1.50.0.46 diff --git a/javafx2.samples/BrickBreaker/nbproject/jfx-impl.xml b/javafx2.samples/BrickBreaker/nbproject/jfx-impl.xml index df73304cf..bc99a7944 100644 --- a/javafx2.samples/BrickBreaker/nbproject/jfx-impl.xml +++ b/javafx2.samples/BrickBreaker/nbproject/jfx-impl.xml @@ -1,5 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<!-- *** GENERATED FROM TEMPLATE - DO NOT EDIT *** *** EDIT ../build.xml INSTEAD *** --> diff --git a/javafx2.samples/ChangeListener/nbproject/genfiles.properties b/javafx2.samples/ChangeListener/nbproject/genfiles.properties index 7fae4de9f..2f7b22318 100644 --- a/javafx2.samples/ChangeListener/nbproject/genfiles.properties +++ b/javafx2.samples/ChangeListener/nbproject/genfiles.properties @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. build.xml.data.CRC32=a1fe7080 build.xml.script.CRC32=2865fe64 build.xml.stylesheet.CRC32=28e38971@1.50.0.46 diff --git a/javafx2.samples/ChangeListener/nbproject/jfx-impl.xml b/javafx2.samples/ChangeListener/nbproject/jfx-impl.xml index df73304cf..bc99a7944 100644 --- a/javafx2.samples/ChangeListener/nbproject/jfx-impl.xml +++ b/javafx2.samples/ChangeListener/nbproject/jfx-impl.xml @@ -1,5 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<!-- *** GENERATED FROM TEMPLATE - DO NOT EDIT *** *** EDIT ../build.xml INSTEAD *** --> diff --git a/javafx2.samples/ChartAdvancedArea/nbproject/genfiles.properties b/javafx2.samples/ChartAdvancedArea/nbproject/genfiles.properties index 92a9bc565..8d4ee8803 100644 --- a/javafx2.samples/ChartAdvancedArea/nbproject/genfiles.properties +++ b/javafx2.samples/ChartAdvancedArea/nbproject/genfiles.properties @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. build.xml.data.CRC32=3785964d build.xml.script.CRC32=99fa0fae build.xml.stylesheet.CRC32=28e38971@1.50.0.46 diff --git a/javafx2.samples/ChartAdvancedArea/nbproject/jfx-impl.xml b/javafx2.samples/ChartAdvancedArea/nbproject/jfx-impl.xml index df73304cf..bc99a7944 100644 --- a/javafx2.samples/ChartAdvancedArea/nbproject/jfx-impl.xml +++ b/javafx2.samples/ChartAdvancedArea/nbproject/jfx-impl.xml @@ -1,5 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<!-- *** GENERATED FROM TEMPLATE - DO NOT EDIT *** *** EDIT ../build.xml INSTEAD *** --> diff --git a/javafx2.samples/ChartAdvancedBar/nbproject/genfiles.properties b/javafx2.samples/ChartAdvancedBar/nbproject/genfiles.properties index af7a812cc..aae9d3688 100644 --- a/javafx2.samples/ChartAdvancedBar/nbproject/genfiles.properties +++ b/javafx2.samples/ChartAdvancedBar/nbproject/genfiles.properties @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. build.xml.data.CRC32=4caf1e0e build.xml.script.CRC32=68d40498 build.xml.stylesheet.CRC32=28e38971@1.50.0.46 diff --git a/javafx2.samples/ChartAdvancedBar/nbproject/jfx-impl.xml b/javafx2.samples/ChartAdvancedBar/nbproject/jfx-impl.xml index df73304cf..bc99a7944 100644 --- a/javafx2.samples/ChartAdvancedBar/nbproject/jfx-impl.xml +++ b/javafx2.samples/ChartAdvancedBar/nbproject/jfx-impl.xml @@ -1,5 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<!-- *** GENERATED FROM TEMPLATE - DO NOT EDIT *** *** EDIT ../build.xml INSTEAD *** --> diff --git a/javafx2.samples/ChartAdvancedPie/nbproject/genfiles.properties b/javafx2.samples/ChartAdvancedPie/nbproject/genfiles.properties index 3e7b4eb72..734cd0515 100644 --- a/javafx2.samples/ChartAdvancedPie/nbproject/genfiles.properties +++ b/javafx2.samples/ChartAdvancedPie/nbproject/genfiles.properties @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. build.xml.data.CRC32=1ac89771 build.xml.script.CRC32=43c2be97 build.xml.stylesheet.CRC32=28e38971@1.50.0.46 diff --git a/javafx2.samples/ChartAdvancedPie/nbproject/jfx-impl.xml b/javafx2.samples/ChartAdvancedPie/nbproject/jfx-impl.xml index df73304cf..bc99a7944 100644 --- a/javafx2.samples/ChartAdvancedPie/nbproject/jfx-impl.xml +++ b/javafx2.samples/ChartAdvancedPie/nbproject/jfx-impl.xml @@ -1,5 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<!-- *** GENERATED FROM TEMPLATE - DO NOT EDIT *** *** EDIT ../build.xml INSTEAD *** --> diff --git a/javafx2.samples/ChartAdvancedScatter/nbproject/genfiles.properties b/javafx2.samples/ChartAdvancedScatter/nbproject/genfiles.properties index 9bea09cf3..5370248d0 100644 --- a/javafx2.samples/ChartAdvancedScatter/nbproject/genfiles.properties +++ b/javafx2.samples/ChartAdvancedScatter/nbproject/genfiles.properties @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. build.xml.data.CRC32=d0407cc2 build.xml.script.CRC32=b1af2d11 build.xml.stylesheet.CRC32=28e38971@1.50.0.46 diff --git a/javafx2.samples/ChartAdvancedScatter/nbproject/jfx-impl.xml b/javafx2.samples/ChartAdvancedScatter/nbproject/jfx-impl.xml index df73304cf..bc99a7944 100644 --- a/javafx2.samples/ChartAdvancedScatter/nbproject/jfx-impl.xml +++ b/javafx2.samples/ChartAdvancedScatter/nbproject/jfx-impl.xml @@ -1,5 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<!-- *** GENERATED FROM TEMPLATE - DO NOT EDIT *** *** EDIT ../build.xml INSTEAD *** --> diff --git a/javafx2.samples/ChartAdvancedScatterLive/nbproject/genfiles.properties b/javafx2.samples/ChartAdvancedScatterLive/nbproject/genfiles.properties index a0efa1711..7eb8e567a 100644 --- a/javafx2.samples/ChartAdvancedScatterLive/nbproject/genfiles.properties +++ b/javafx2.samples/ChartAdvancedScatterLive/nbproject/genfiles.properties @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. build.xml.data.CRC32=371c89d8 build.xml.script.CRC32=7ba5abb9 build.xml.stylesheet.CRC32=28e38971@1.50.0.46 diff --git a/javafx2.samples/ChartAdvancedScatterLive/nbproject/jfx-impl.xml b/javafx2.samples/ChartAdvancedScatterLive/nbproject/jfx-impl.xml index df73304cf..bc99a7944 100644 --- a/javafx2.samples/ChartAdvancedScatterLive/nbproject/jfx-impl.xml +++ b/javafx2.samples/ChartAdvancedScatterLive/nbproject/jfx-impl.xml @@ -1,5 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<!-- *** GENERATED FROM TEMPLATE - DO NOT EDIT *** *** EDIT ../build.xml INSTEAD *** --> diff --git a/javafx2.samples/ChartAdvancedStockLine/nbproject/genfiles.properties b/javafx2.samples/ChartAdvancedStockLine/nbproject/genfiles.properties index ee5638438..3a75057c6 100644 --- a/javafx2.samples/ChartAdvancedStockLine/nbproject/genfiles.properties +++ b/javafx2.samples/ChartAdvancedStockLine/nbproject/genfiles.properties @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. build.xml.data.CRC32=83aaf715 build.xml.script.CRC32=83461ba7 build.xml.stylesheet.CRC32=28e38971@1.50.0.46 diff --git a/javafx2.samples/ChartAdvancedStockLine/nbproject/jfx-impl.xml b/javafx2.samples/ChartAdvancedStockLine/nbproject/jfx-impl.xml index df73304cf..bc99a7944 100644 --- a/javafx2.samples/ChartAdvancedStockLine/nbproject/jfx-impl.xml +++ b/javafx2.samples/ChartAdvancedStockLine/nbproject/jfx-impl.xml @@ -1,5 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<!-- *** GENERATED FROM TEMPLATE - DO NOT EDIT *** *** EDIT ../build.xml INSTEAD *** --> diff --git a/javafx2.samples/ChartAudioArea/nbproject/genfiles.properties b/javafx2.samples/ChartAudioArea/nbproject/genfiles.properties index faad3b7ee..d9221c827 100644 --- a/javafx2.samples/ChartAudioArea/nbproject/genfiles.properties +++ b/javafx2.samples/ChartAudioArea/nbproject/genfiles.properties @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. build.xml.data.CRC32=14a00628 build.xml.script.CRC32=d1decc9a build.xml.stylesheet.CRC32=28e38971@1.50.0.46 diff --git a/javafx2.samples/ChartAudioArea/nbproject/jfx-impl.xml b/javafx2.samples/ChartAudioArea/nbproject/jfx-impl.xml index df73304cf..bc99a7944 100644 --- a/javafx2.samples/ChartAudioArea/nbproject/jfx-impl.xml +++ b/javafx2.samples/ChartAudioArea/nbproject/jfx-impl.xml @@ -1,5 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<!-- *** GENERATED FROM TEMPLATE - DO NOT EDIT *** *** EDIT ../build.xml INSTEAD *** --> diff --git a/javafx2.samples/ChartAudioBar/nbproject/genfiles.properties b/javafx2.samples/ChartAudioBar/nbproject/genfiles.properties index 130819bef..9710cfb31 100644 --- a/javafx2.samples/ChartAudioBar/nbproject/genfiles.properties +++ b/javafx2.samples/ChartAudioBar/nbproject/genfiles.properties @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. build.xml.data.CRC32=b058c4f9 build.xml.script.CRC32=735c1c96 build.xml.stylesheet.CRC32=28e38971@1.50.0.46 diff --git a/javafx2.samples/ChartAudioBar/nbproject/jfx-impl.xml b/javafx2.samples/ChartAudioBar/nbproject/jfx-impl.xml index df73304cf..bc99a7944 100644 --- a/javafx2.samples/ChartAudioBar/nbproject/jfx-impl.xml +++ b/javafx2.samples/ChartAudioBar/nbproject/jfx-impl.xml @@ -1,5 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<!-- *** GENERATED FROM TEMPLATE - DO NOT EDIT *** *** EDIT ../build.xml INSTEAD *** --> diff --git a/javafx2.samples/ChartLine/nbproject/genfiles.properties b/javafx2.samples/ChartLine/nbproject/genfiles.properties index 70623cc05..96f09ab1d 100644 --- a/javafx2.samples/ChartLine/nbproject/genfiles.properties +++ b/javafx2.samples/ChartLine/nbproject/genfiles.properties @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. build.xml.data.CRC32=91360212 build.xml.script.CRC32=1afbf574 build.xml.stylesheet.CRC32=28e38971@1.50.0.46 diff --git a/javafx2.samples/ChartLine/nbproject/jfx-impl.xml b/javafx2.samples/ChartLine/nbproject/jfx-impl.xml index df73304cf..bc99a7944 100644 --- a/javafx2.samples/ChartLine/nbproject/jfx-impl.xml +++ b/javafx2.samples/ChartLine/nbproject/jfx-impl.xml @@ -1,5 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<!-- *** GENERATED FROM TEMPLATE - DO NOT EDIT *** *** EDIT ../build.xml INSTEAD *** --> diff --git a/javafx2.samples/ColorPicker/nbproject/genfiles.properties b/javafx2.samples/ColorPicker/nbproject/genfiles.properties index 961636035..3f9a35725 100644 --- a/javafx2.samples/ColorPicker/nbproject/genfiles.properties +++ b/javafx2.samples/ColorPicker/nbproject/genfiles.properties @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. build.xml.data.CRC32=7d4b03aa build.xml.script.CRC32=566b8eb8 build.xml.stylesheet.CRC32=28e38971@1.50.1.46 diff --git a/javafx2.samples/ColorPicker/nbproject/jfx-impl.xml b/javafx2.samples/ColorPicker/nbproject/jfx-impl.xml index df73304cf..bc99a7944 100644 --- a/javafx2.samples/ColorPicker/nbproject/jfx-impl.xml +++ b/javafx2.samples/ColorPicker/nbproject/jfx-impl.xml @@ -1,5 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<!-- *** GENERATED FROM TEMPLATE - DO NOT EDIT *** *** EDIT ../build.xml INSTEAD *** --> diff --git a/javafx2.samples/ColorfulCircles/nbproject/genfiles.properties b/javafx2.samples/ColorfulCircles/nbproject/genfiles.properties index b11b78469..96f18c3b3 100644 --- a/javafx2.samples/ColorfulCircles/nbproject/genfiles.properties +++ b/javafx2.samples/ColorfulCircles/nbproject/genfiles.properties @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. build.xml.data.CRC32=7fab2abb build.xml.script.CRC32=62a5603c build.xml.stylesheet.CRC32=28e38971@1.50.0.46 diff --git a/javafx2.samples/ColorfulCircles/nbproject/jfx-impl.xml b/javafx2.samples/ColorfulCircles/nbproject/jfx-impl.xml index df73304cf..bc99a7944 100644 --- a/javafx2.samples/ColorfulCircles/nbproject/jfx-impl.xml +++ b/javafx2.samples/ColorfulCircles/nbproject/jfx-impl.xml @@ -1,5 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<!-- *** GENERATED FROM TEMPLATE - DO NOT EDIT *** *** EDIT ../build.xml INSTEAD *** --> diff --git a/javafx2.samples/CreateAdvancedStage/nbproject/genfiles.properties b/javafx2.samples/CreateAdvancedStage/nbproject/genfiles.properties index a157cbdbd..415082aa7 100644 --- a/javafx2.samples/CreateAdvancedStage/nbproject/genfiles.properties +++ b/javafx2.samples/CreateAdvancedStage/nbproject/genfiles.properties @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. build.xml.data.CRC32=bd7fd3d7 build.xml.script.CRC32=29286ed9 build.xml.stylesheet.CRC32=28e38971@1.50.0.46 diff --git a/javafx2.samples/CreateAdvancedStage/nbproject/jfx-impl.xml b/javafx2.samples/CreateAdvancedStage/nbproject/jfx-impl.xml index df73304cf..bc99a7944 100644 --- a/javafx2.samples/CreateAdvancedStage/nbproject/jfx-impl.xml +++ b/javafx2.samples/CreateAdvancedStage/nbproject/jfx-impl.xml @@ -1,5 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<!-- *** GENERATED FROM TEMPLATE - DO NOT EDIT *** *** EDIT ../build.xml INSTEAD *** --> diff --git a/javafx2.samples/Cube3D/nbproject/genfiles.properties b/javafx2.samples/Cube3D/nbproject/genfiles.properties index af03e85d4..f25e313fa 100644 --- a/javafx2.samples/Cube3D/nbproject/genfiles.properties +++ b/javafx2.samples/Cube3D/nbproject/genfiles.properties @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. build.xml.data.CRC32=ee20a4c1 build.xml.script.CRC32=e88c0a5d build.xml.stylesheet.CRC32=28e38971@1.50.0.46 diff --git a/javafx2.samples/Cube3D/nbproject/jfx-impl.xml b/javafx2.samples/Cube3D/nbproject/jfx-impl.xml index df73304cf..bc99a7944 100644 --- a/javafx2.samples/Cube3D/nbproject/jfx-impl.xml +++ b/javafx2.samples/Cube3D/nbproject/jfx-impl.xml @@ -1,5 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<!-- *** GENERATED FROM TEMPLATE - DO NOT EDIT *** *** EDIT ../build.xml INSTEAD *** --> diff --git a/javafx2.samples/CubeSystem3D/nbproject/genfiles.properties b/javafx2.samples/CubeSystem3D/nbproject/genfiles.properties index 77fa2815e..c24f1d57a 100644 --- a/javafx2.samples/CubeSystem3D/nbproject/genfiles.properties +++ b/javafx2.samples/CubeSystem3D/nbproject/genfiles.properties @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. build.xml.data.CRC32=d6e2bff4 build.xml.script.CRC32=0ceaf520 build.xml.stylesheet.CRC32=28e38971@1.50.0.46 diff --git a/javafx2.samples/CubeSystem3D/nbproject/jfx-impl.xml b/javafx2.samples/CubeSystem3D/nbproject/jfx-impl.xml index df73304cf..bc99a7944 100644 --- a/javafx2.samples/CubeSystem3D/nbproject/jfx-impl.xml +++ b/javafx2.samples/CubeSystem3D/nbproject/jfx-impl.xml @@ -1,5 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<!-- *** GENERATED FROM TEMPLATE - DO NOT EDIT *** *** EDIT ../build.xml INSTEAD *** --> diff --git a/javafx2.samples/DigitalClock/nbproject/genfiles.properties b/javafx2.samples/DigitalClock/nbproject/genfiles.properties index 153057525..bf19ab705 100644 --- a/javafx2.samples/DigitalClock/nbproject/genfiles.properties +++ b/javafx2.samples/DigitalClock/nbproject/genfiles.properties @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. build.xml.data.CRC32=f8009899 build.xml.script.CRC32=b6634440 build.xml.stylesheet.CRC32=28e38971@1.50.0.46 diff --git a/javafx2.samples/DigitalClock/nbproject/jfx-impl.xml b/javafx2.samples/DigitalClock/nbproject/jfx-impl.xml index df73304cf..bc99a7944 100644 --- a/javafx2.samples/DigitalClock/nbproject/jfx-impl.xml +++ b/javafx2.samples/DigitalClock/nbproject/jfx-impl.xml @@ -1,5 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<!-- *** GENERATED FROM TEMPLATE - DO NOT EDIT *** *** EDIT ../build.xml INSTEAD *** --> diff --git a/javafx2.samples/DisplayShelf/nbproject/genfiles.properties b/javafx2.samples/DisplayShelf/nbproject/genfiles.properties index 2e7d3d5f5..2d4b43bbb 100644 --- a/javafx2.samples/DisplayShelf/nbproject/genfiles.properties +++ b/javafx2.samples/DisplayShelf/nbproject/genfiles.properties @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. build.xml.data.CRC32=1a89b0a1 build.xml.script.CRC32=b0b3c706 build.xml.stylesheet.CRC32=28e38971@1.50.0.46 diff --git a/javafx2.samples/DisplayShelf/nbproject/jfx-impl.xml b/javafx2.samples/DisplayShelf/nbproject/jfx-impl.xml index df73304cf..bc99a7944 100644 --- a/javafx2.samples/DisplayShelf/nbproject/jfx-impl.xml +++ b/javafx2.samples/DisplayShelf/nbproject/jfx-impl.xml @@ -1,5 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<!-- *** GENERATED FROM TEMPLATE - DO NOT EDIT *** *** EDIT ../build.xml INSTEAD *** --> diff --git a/javafx2.samples/FXML-LoginDemo/nbproject/genfiles.properties b/javafx2.samples/FXML-LoginDemo/nbproject/genfiles.properties index 84f845930..8c61d5bac 100644 --- a/javafx2.samples/FXML-LoginDemo/nbproject/genfiles.properties +++ b/javafx2.samples/FXML-LoginDemo/nbproject/genfiles.properties @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. build.xml.data.CRC32=2d55b990 build.xml.script.CRC32=6073ea12 build.xml.stylesheet.CRC32=28e38971@1.50.0.46 diff --git a/javafx2.samples/FXML-LoginDemo/nbproject/jfx-impl.xml b/javafx2.samples/FXML-LoginDemo/nbproject/jfx-impl.xml index df73304cf..bc99a7944 100644 --- a/javafx2.samples/FXML-LoginDemo/nbproject/jfx-impl.xml +++ b/javafx2.samples/FXML-LoginDemo/nbproject/jfx-impl.xml @@ -1,5 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<!-- *** GENERATED FROM TEMPLATE - DO NOT EDIT *** *** EDIT ../build.xml INSTEAD *** --> diff --git a/javafx2.samples/FXML-LoginDemo/src/demo/profile.fxml b/javafx2.samples/FXML-LoginDemo/src/demo/profile.fxml index 910e96f86..2ea9a043e 100644 --- a/javafx2.samples/FXML-LoginDemo/src/demo/profile.fxml +++ b/javafx2.samples/FXML-LoginDemo/src/demo/profile.fxml @@ -1,34 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - * Copyright (c) 2008, 2012 Oracle and/or its affiliates. - * All rights reserved. Use is subject to license terms. - * - * This file is available and licensed under the following license: - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the distribution. - * - Neither the name of Oracle Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + --> <?import java.lang.*?> <?import java.net.*?> diff --git a/javafx2.samples/Fireworks/nbproject/genfiles.properties b/javafx2.samples/Fireworks/nbproject/genfiles.properties index 7aaf50032..1d72b0983 100644 --- a/javafx2.samples/Fireworks/nbproject/genfiles.properties +++ b/javafx2.samples/Fireworks/nbproject/genfiles.properties @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. build.xml.data.CRC32=7d4b03aa build.xml.script.CRC32=566b8eb8 build.xml.stylesheet.CRC32=28e38971@1.50.1.46 diff --git a/javafx2.samples/Fireworks/nbproject/jfx-impl.xml b/javafx2.samples/Fireworks/nbproject/jfx-impl.xml index df73304cf..bc99a7944 100644 --- a/javafx2.samples/Fireworks/nbproject/jfx-impl.xml +++ b/javafx2.samples/Fireworks/nbproject/jfx-impl.xml @@ -1,5 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<!-- *** GENERATED FROM TEMPLATE - DO NOT EDIT *** *** EDIT ../build.xml INSTEAD *** --> diff --git a/javafx2.samples/HTMLEditorApp/nbproject/genfiles.properties b/javafx2.samples/HTMLEditorApp/nbproject/genfiles.properties index 9b5c42f97..e4dfef016 100644 --- a/javafx2.samples/HTMLEditorApp/nbproject/genfiles.properties +++ b/javafx2.samples/HTMLEditorApp/nbproject/genfiles.properties @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. build.xml.data.CRC32=c1f0b672 build.xml.script.CRC32=04e2224d build.xml.stylesheet.CRC32=28e38971@1.50.0.46 diff --git a/javafx2.samples/HTMLEditorApp/nbproject/jfx-impl.xml b/javafx2.samples/HTMLEditorApp/nbproject/jfx-impl.xml index df73304cf..bc99a7944 100644 --- a/javafx2.samples/HTMLEditorApp/nbproject/jfx-impl.xml +++ b/javafx2.samples/HTMLEditorApp/nbproject/jfx-impl.xml @@ -1,5 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<!-- *** GENERATED FROM TEMPLATE - DO NOT EDIT *** *** EDIT ../build.xml INSTEAD *** --> diff --git a/javafx2.samples/KeyStrokeMotion/nbproject/genfiles.properties b/javafx2.samples/KeyStrokeMotion/nbproject/genfiles.properties index d169b07cf..6d721da22 100644 --- a/javafx2.samples/KeyStrokeMotion/nbproject/genfiles.properties +++ b/javafx2.samples/KeyStrokeMotion/nbproject/genfiles.properties @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. build.xml.data.CRC32=ed55cdec build.xml.script.CRC32=591ca624 build.xml.stylesheet.CRC32=28e38971@1.50.0.46 diff --git a/javafx2.samples/KeyStrokeMotion/nbproject/jfx-impl.xml b/javafx2.samples/KeyStrokeMotion/nbproject/jfx-impl.xml index df73304cf..bc99a7944 100644 --- a/javafx2.samples/KeyStrokeMotion/nbproject/jfx-impl.xml +++ b/javafx2.samples/KeyStrokeMotion/nbproject/jfx-impl.xml @@ -1,5 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<!-- *** GENERATED FROM TEMPLATE - DO NOT EDIT *** *** EDIT ../build.xml INSTEAD *** --> diff --git a/javafx2.samples/MouseEvents/nbproject/genfiles.properties b/javafx2.samples/MouseEvents/nbproject/genfiles.properties index 20904f1ef..1066794ad 100644 --- a/javafx2.samples/MouseEvents/nbproject/genfiles.properties +++ b/javafx2.samples/MouseEvents/nbproject/genfiles.properties @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. build.xml.data.CRC32=724cb2eb build.xml.script.CRC32=0548481c build.xml.stylesheet.CRC32=28e38971@1.50.0.46 diff --git a/javafx2.samples/MouseEvents/nbproject/jfx-impl.xml b/javafx2.samples/MouseEvents/nbproject/jfx-impl.xml index df73304cf..bc99a7944 100644 --- a/javafx2.samples/MouseEvents/nbproject/jfx-impl.xml +++ b/javafx2.samples/MouseEvents/nbproject/jfx-impl.xml @@ -1,5 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<!-- *** GENERATED FROM TEMPLATE - DO NOT EDIT *** *** EDIT ../build.xml INSTEAD *** --> diff --git a/javafx2.samples/PaginationDemo/nbproject/genfiles.properties b/javafx2.samples/PaginationDemo/nbproject/genfiles.properties index 3a749e9b7..5c89182a8 100644 --- a/javafx2.samples/PaginationDemo/nbproject/genfiles.properties +++ b/javafx2.samples/PaginationDemo/nbproject/genfiles.properties @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. build.xml.data.CRC32=7d4b03aa build.xml.script.CRC32=566b8eb8 build.xml.stylesheet.CRC32=28e38971@1.50.1.46 diff --git a/javafx2.samples/PaginationDemo/nbproject/jfx-impl.xml b/javafx2.samples/PaginationDemo/nbproject/jfx-impl.xml index df73304cf..bc99a7944 100644 --- a/javafx2.samples/PaginationDemo/nbproject/jfx-impl.xml +++ b/javafx2.samples/PaginationDemo/nbproject/jfx-impl.xml @@ -1,5 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<!-- *** GENERATED FROM TEMPLATE - DO NOT EDIT *** *** EDIT ../build.xml INSTEAD *** --> diff --git a/javafx2.samples/PuzzlePieces/nbproject/genfiles.properties b/javafx2.samples/PuzzlePieces/nbproject/genfiles.properties index bfa60ad42..dc90d876d 100644 --- a/javafx2.samples/PuzzlePieces/nbproject/genfiles.properties +++ b/javafx2.samples/PuzzlePieces/nbproject/genfiles.properties @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. build.xml.data.CRC32=628f1499 build.xml.script.CRC32=dc7addfa build.xml.stylesheet.CRC32=28e38971@1.50.0.46 diff --git a/javafx2.samples/PuzzlePieces/nbproject/jfx-impl.xml b/javafx2.samples/PuzzlePieces/nbproject/jfx-impl.xml index df73304cf..bc99a7944 100644 --- a/javafx2.samples/PuzzlePieces/nbproject/jfx-impl.xml +++ b/javafx2.samples/PuzzlePieces/nbproject/jfx-impl.xml @@ -1,5 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<!-- *** GENERATED FROM TEMPLATE - DO NOT EDIT *** *** EDIT ../build.xml INSTEAD *** --> diff --git a/javafx2.samples/StopWatch/nbproject/genfiles.properties b/javafx2.samples/StopWatch/nbproject/genfiles.properties index f42e81e26..704ea4df0 100644 --- a/javafx2.samples/StopWatch/nbproject/genfiles.properties +++ b/javafx2.samples/StopWatch/nbproject/genfiles.properties @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. build.xml.data.CRC32=8c35021f build.xml.script.CRC32=53594476 build.xml.stylesheet.CRC32=28e38971@1.50.0.46 diff --git a/javafx2.samples/StopWatch/nbproject/jfx-impl.xml b/javafx2.samples/StopWatch/nbproject/jfx-impl.xml index df73304cf..bc99a7944 100644 --- a/javafx2.samples/StopWatch/nbproject/jfx-impl.xml +++ b/javafx2.samples/StopWatch/nbproject/jfx-impl.xml @@ -1,5 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<!-- *** GENERATED FROM TEMPLATE - DO NOT EDIT *** *** EDIT ../build.xml INSTEAD *** --> diff --git a/javafx2.samples/SwingInterop/nbproject/genfiles.properties b/javafx2.samples/SwingInterop/nbproject/genfiles.properties index 2fa27d064..cfdeed263 100644 --- a/javafx2.samples/SwingInterop/nbproject/genfiles.properties +++ b/javafx2.samples/SwingInterop/nbproject/genfiles.properties @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. build.xml.data.CRC32=e2785b9b build.xml.script.CRC32=55a7c8df build.xml.stylesheet.CRC32=28e38971@1.51.0.46 diff --git a/javafx2.samples/SwingInterop/nbproject/jfx-impl.xml b/javafx2.samples/SwingInterop/nbproject/jfx-impl.xml index df73304cf..bc99a7944 100644 --- a/javafx2.samples/SwingInterop/nbproject/jfx-impl.xml +++ b/javafx2.samples/SwingInterop/nbproject/jfx-impl.xml @@ -1,5 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<!-- *** GENERATED FROM TEMPLATE - DO NOT EDIT *** *** EDIT ../build.xml INSTEAD *** --> diff --git a/javafx2.samples/TimelineEvents/nbproject/genfiles.properties b/javafx2.samples/TimelineEvents/nbproject/genfiles.properties index f9dae6442..2f7222aeb 100644 --- a/javafx2.samples/TimelineEvents/nbproject/genfiles.properties +++ b/javafx2.samples/TimelineEvents/nbproject/genfiles.properties @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. build.xml.data.CRC32=16baf963 build.xml.script.CRC32=e4c49c34 build.xml.stylesheet.CRC32=28e38971@1.50.0.46 diff --git a/javafx2.samples/TimelineEvents/nbproject/jfx-impl.xml b/javafx2.samples/TimelineEvents/nbproject/jfx-impl.xml index df73304cf..bc99a7944 100644 --- a/javafx2.samples/TimelineEvents/nbproject/jfx-impl.xml +++ b/javafx2.samples/TimelineEvents/nbproject/jfx-impl.xml @@ -1,5 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<!-- *** GENERATED FROM TEMPLATE - DO NOT EDIT *** *** EDIT ../build.xml INSTEAD *** --> diff --git a/javafx2.samples/TimelineInterpolator/nbproject/genfiles.properties b/javafx2.samples/TimelineInterpolator/nbproject/genfiles.properties index ebbee50f1..27341161b 100644 --- a/javafx2.samples/TimelineInterpolator/nbproject/genfiles.properties +++ b/javafx2.samples/TimelineInterpolator/nbproject/genfiles.properties @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. build.xml.data.CRC32=92d44469 build.xml.script.CRC32=253ab225 build.xml.stylesheet.CRC32=28e38971@1.50.0.46 diff --git a/javafx2.samples/TimelineInterpolator/nbproject/jfx-impl.xml b/javafx2.samples/TimelineInterpolator/nbproject/jfx-impl.xml index df73304cf..bc99a7944 100644 --- a/javafx2.samples/TimelineInterpolator/nbproject/jfx-impl.xml +++ b/javafx2.samples/TimelineInterpolator/nbproject/jfx-impl.xml @@ -1,5 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<!-- *** GENERATED FROM TEMPLATE - DO NOT EDIT *** *** EDIT ../build.xml INSTEAD *** --> diff --git a/javafx2.samples/TransitionPath/nbproject/genfiles.properties b/javafx2.samples/TransitionPath/nbproject/genfiles.properties index dc82faedd..b0abd0751 100644 --- a/javafx2.samples/TransitionPath/nbproject/genfiles.properties +++ b/javafx2.samples/TransitionPath/nbproject/genfiles.properties @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. build.xml.data.CRC32=750e364f build.xml.script.CRC32=66bb3585 build.xml.stylesheet.CRC32=28e38971@1.50.0.46 diff --git a/javafx2.samples/TransitionPath/nbproject/jfx-impl.xml b/javafx2.samples/TransitionPath/nbproject/jfx-impl.xml index df73304cf..bc99a7944 100644 --- a/javafx2.samples/TransitionPath/nbproject/jfx-impl.xml +++ b/javafx2.samples/TransitionPath/nbproject/jfx-impl.xml @@ -1,5 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<!-- *** GENERATED FROM TEMPLATE - DO NOT EDIT *** *** EDIT ../build.xml INSTEAD *** --> diff --git a/javafx2.samples/TransitionRotate/nbproject/genfiles.properties b/javafx2.samples/TransitionRotate/nbproject/genfiles.properties index 7e474a067..a13e54c26 100644 --- a/javafx2.samples/TransitionRotate/nbproject/genfiles.properties +++ b/javafx2.samples/TransitionRotate/nbproject/genfiles.properties @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. build.xml.data.CRC32=184a9eea build.xml.script.CRC32=236e1144 build.xml.stylesheet.CRC32=28e38971@1.50.0.46 diff --git a/javafx2.samples/TransitionRotate/nbproject/jfx-impl.xml b/javafx2.samples/TransitionRotate/nbproject/jfx-impl.xml index df73304cf..bc99a7944 100644 --- a/javafx2.samples/TransitionRotate/nbproject/jfx-impl.xml +++ b/javafx2.samples/TransitionRotate/nbproject/jfx-impl.xml @@ -1,5 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<!-- *** GENERATED FROM TEMPLATE - DO NOT EDIT *** *** EDIT ../build.xml INSTEAD *** --> diff --git a/javafx2.samples/WebViewBrowser/nbproject/genfiles.properties b/javafx2.samples/WebViewBrowser/nbproject/genfiles.properties index 131a2f436..a7e2b2c2f 100644 --- a/javafx2.samples/WebViewBrowser/nbproject/genfiles.properties +++ b/javafx2.samples/WebViewBrowser/nbproject/genfiles.properties @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. build.xml.data.CRC32=a6535181 build.xml.script.CRC32=00335096 build.xml.stylesheet.CRC32=28e38971@1.50.0.46 diff --git a/javafx2.samples/WebViewBrowser/nbproject/jfx-impl.xml b/javafx2.samples/WebViewBrowser/nbproject/jfx-impl.xml index df73304cf..bc99a7944 100644 --- a/javafx2.samples/WebViewBrowser/nbproject/jfx-impl.xml +++ b/javafx2.samples/WebViewBrowser/nbproject/jfx-impl.xml @@ -1,5 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<!-- *** GENERATED FROM TEMPLATE - DO NOT EDIT *** *** EDIT ../build.xml INSTEAD *** --> diff --git a/javafx2.samples/Xylophone/nbproject/genfiles.properties b/javafx2.samples/Xylophone/nbproject/genfiles.properties index d4318d997..ef70b747d 100644 --- a/javafx2.samples/Xylophone/nbproject/genfiles.properties +++ b/javafx2.samples/Xylophone/nbproject/genfiles.properties @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. build.xml.data.CRC32=f105f76f build.xml.script.CRC32=94793a6d build.xml.stylesheet.CRC32=28e38971@1.50.0.46 diff --git a/javafx2.samples/Xylophone/nbproject/jfx-impl.xml b/javafx2.samples/Xylophone/nbproject/jfx-impl.xml index df73304cf..bc99a7944 100644 --- a/javafx2.samples/Xylophone/nbproject/jfx-impl.xml +++ b/javafx2.samples/Xylophone/nbproject/jfx-impl.xml @@ -1,5 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<!-- *** GENERATED FROM TEMPLATE - DO NOT EDIT *** *** EDIT ../build.xml INSTEAD *** --> diff --git a/javafx2.samples/l10n.list b/javafx2.samples/l10n.list index 6f51f89e7..4913a6141 100644 --- a/javafx2.samples/l10n.list +++ b/javafx2.samples/l10n.list @@ -1,2 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# # javafx2/samples read global diff --git a/javahelp/l10n.list b/javahelp/l10n.list index 8c44400b4..d1b0e520c 100644 --- a/javahelp/l10n.list +++ b/javahelp/l10n.list @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# # core/javahelp read global ${l10n-module}/src/**/resources/*.xml diff --git a/javawebstart/AntTasks/nbproject/project.properties b/javawebstart/AntTasks/nbproject/project.properties index d50b4a9e6..ba2a717e2 100644 --- a/javawebstart/AntTasks/nbproject/project.properties +++ b/javawebstart/AntTasks/nbproject/project.properties @@ -1,44 +1,25 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + annotation.processing.enabled=true annotation.processing.enabled.in.editor=false annotation.processing.processors.list= annotation.processing.run.all.processors=true -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -# -# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved. -# -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. -# -# Contributor(s): + application.title=AntTasks application.vendor=NetBeans.org build.classes.dir=${build.dir}/classes diff --git a/jellytools.ide/test/qa-functional/data/SampleProject/build.xml b/jellytools.ide/test/qa-functional/data/SampleProject/build.xml index 5c96d3588..9b0608d82 100644 --- a/jellytools.ide/test/qa-functional/data/SampleProject/build.xml +++ b/jellytools.ide/test/qa-functional/data/SampleProject/build.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- You may freely edit this file. See commented blocks below for --> <!-- some examples of how to customize the build. --> <!-- (If you delete it and reopen the project it will be recreated.) --> diff --git a/jellytools.ide/test/qa-functional/data/SampleProject/nbproject/project.properties b/jellytools.ide/test/qa-functional/data/SampleProject/nbproject/project.properties index 6b089b3ab..c67268146 100644 --- a/jellytools.ide/test/qa-functional/data/SampleProject/nbproject/project.properties +++ b/jellytools.ide/test/qa-functional/data/SampleProject/nbproject/project.properties @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + annotation.processing.enabled=true annotation.processing.enabled.in.editor=false annotation.processing.run.all.processors=true diff --git a/jellytools.ide/test/qa-functional/data/SampleProject/nbproject/project.xml b/jellytools.ide/test/qa-functional/data/SampleProject/nbproject/project.xml index 8036c4e1a..20fd71016 100644 --- a/jellytools.ide/test/qa-functional/data/SampleProject/nbproject/project.xml +++ b/jellytools.ide/test/qa-functional/data/SampleProject/nbproject/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.java.j2seproject</type> <configuration> diff --git a/jellytools.java/test/qa-functional/data/SampleProject/build.xml b/jellytools.java/test/qa-functional/data/SampleProject/build.xml index 5c96d3588..9b0608d82 100644 --- a/jellytools.java/test/qa-functional/data/SampleProject/build.xml +++ b/jellytools.java/test/qa-functional/data/SampleProject/build.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- You may freely edit this file. See commented blocks below for --> <!-- some examples of how to customize the build. --> <!-- (If you delete it and reopen the project it will be recreated.) --> diff --git a/jellytools.java/test/qa-functional/data/SampleProject/nbproject/project.properties b/jellytools.java/test/qa-functional/data/SampleProject/nbproject/project.properties index 6b089b3ab..c67268146 100644 --- a/jellytools.java/test/qa-functional/data/SampleProject/nbproject/project.properties +++ b/jellytools.java/test/qa-functional/data/SampleProject/nbproject/project.properties @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + annotation.processing.enabled=true annotation.processing.enabled.in.editor=false annotation.processing.run.all.processors=true diff --git a/jellytools.java/test/qa-functional/data/SampleProject/nbproject/project.xml b/jellytools.java/test/qa-functional/data/SampleProject/nbproject/project.xml index 8036c4e1a..20fd71016 100644 --- a/jellytools.java/test/qa-functional/data/SampleProject/nbproject/project.xml +++ b/jellytools.java/test/qa-functional/data/SampleProject/nbproject/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.java.j2seproject</type> <configuration> diff --git a/jellytools.platform/test/qa-functional/data/SampleProject/nbproject/project.properties b/jellytools.platform/test/qa-functional/data/SampleProject/nbproject/project.properties index f306d090c..c7e450bb2 100644 --- a/jellytools.platform/test/qa-functional/data/SampleProject/nbproject/project.properties +++ b/jellytools.platform/test/qa-functional/data/SampleProject/nbproject/project.properties @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + application.args= application.title=SampleProject application.vendor=shura diff --git a/jellytools.platform/test/qa-functional/data/SampleProject/nbproject/project.xml b/jellytools.platform/test/qa-functional/data/SampleProject/nbproject/project.xml index 8036c4e1a..20fd71016 100644 --- a/jellytools.platform/test/qa-functional/data/SampleProject/nbproject/project.xml +++ b/jellytools.platform/test/qa-functional/data/SampleProject/nbproject/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.java.j2seproject</type> <configuration> diff --git a/jumpto/build.xml b/jumpto/build.xml index 1ddc56b06..9b243d007 100644 --- a/jumpto/build.xml +++ b/jumpto/build.xml @@ -1,48 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. - -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. - - -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" - -Contributor(s): - -The Original Software is the Accelerators module. -The Initial Developer of the Original Software is Andrei Badea. -Portions Copyright 2005-2006 Andrei Badea. -All Rights Reserved. - -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. --> <project basedir="." default="netbeans" name="jumpto"> diff --git a/jumpto/nbproject/project.properties b/jumpto/nbproject/project.properties index 1e7e32f0c..34a65dbb6 100644 --- a/jumpto/nbproject/project.properties +++ b/jumpto/nbproject/project.properties @@ -1,45 +1,19 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. +# http://www.apache.org/licenses/LICENSE-2.0 # -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# Contributor(s): -# -# The Original Software is the Accelerators module. -# The Initial Developer of the Original Software is Andrei Badea. -# Portions Copyright 2005-2006 Andrei Badea. -# All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. javac.compilerargs=-Xlint:unchecked javac.source=1.8 diff --git a/jumpto/nbproject/project.xml b/jumpto/nbproject/project.xml index 7359d8aa9..ff9ec269d 100644 --- a/jumpto/nbproject/project.xml +++ b/jumpto/nbproject/project.xml @@ -1,5 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<!-- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. diff --git a/junit/l10n.list b/junit/l10n.list index d3dce9c2d..9560aee4f 100644 --- a/junit/l10n.list +++ b/junit/l10n.list @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# # junit read global ${l10n-module}/src/org/netbeans/modules/junit/output/res/*.gif diff --git a/junit/test/qa-functional/data/JunitTestProject/build.xml b/junit/test/qa-functional/data/JunitTestProject/build.xml index a700d7ce1..4902a30a0 100644 --- a/junit/test/qa-functional/data/JunitTestProject/build.xml +++ b/junit/test/qa-functional/data/JunitTestProject/build.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- You may freely edit this file. See commented blocks below for --> <!-- some examples of how to customize the build. --> <!-- (If you delete it and reopen the project it will be recreated.) --> diff --git a/junit/test/qa-functional/data/JunitTestProject/nbproject/project.properties b/junit/test/qa-functional/data/JunitTestProject/nbproject/project.properties index e097674be..8c6b7eee4 100644 --- a/junit/test/qa-functional/data/JunitTestProject/nbproject/project.properties +++ b/junit/test/qa-functional/data/JunitTestProject/nbproject/project.properties @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + #Mon Jun 22 14:48:40 CEST 2015 excludes= javac.deprecation=false diff --git a/junit/test/qa-functional/data/JunitTestProject/nbproject/project.xml b/junit/test/qa-functional/data/JunitTestProject/nbproject/project.xml index 4d0ef53da..b7b27c98b 100644 --- a/junit/test/qa-functional/data/JunitTestProject/nbproject/project.xml +++ b/junit/test/qa-functional/data/JunitTestProject/nbproject/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.java.j2seproject</type> <configuration> diff --git a/junitlib/external/binaries-list b/junitlib/external/binaries-list index b3f890074..9932bc778 100644 --- a/junitlib/external/binaries-list +++ b/junitlib/external/binaries-list @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -A6C32B40BF3D76ECA54E3C601E5D1470C86FCDFA junit-4.12-sources.jar -941A8BE4506C65F0A9001C08812FB7DA1E505E21 junit-4.12-javadoc.jar +A6C32B40BF3D76ECA54E3C601E5D1470C86FCDFA junit:junit:4.12:sources +941A8BE4506C65F0A9001C08812FB7DA1E505E21 junit:junit:4.12:javadoc diff --git a/junitlib/external/junit-3.8.2-license.txt b/junitlib/external/junit-3.8.2-license.txt deleted file mode 100644 index 75e380c8f..000000000 --- a/junitlib/external/junit-3.8.2-license.txt +++ /dev/null @@ -1,220 +0,0 @@ -Name: JUnit -Version: 3.8.2 -License: CPL-1.0 -OSR: 1221 -Origin: http://www.junit.org/index.htm -Description: JUnit is a regression testing framework -Files: junit-3.8.2-api.zip, junit-3.8.2.jar - -THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC -LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM -CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. - -1. DEFINITIONS - -"Contribution" means: - - a) in the case of the initial Contributor, the initial code and -documentation distributed under this Agreement, and -b) in the case of each subsequent Contributor: - -i) changes to the Program, and - -ii) additions to the Program; - -where such changes and/or additions to the Program originate from and are -distributed by that particular Contributor. A Contribution 'originates' from a -Contributor if it was added to the Program by such Contributor itself or anyone -acting on such Contributor's behalf. Contributions do not include additions to -the Program which: (i) are separate modules of software distributed in -conjunction with the Program under their own license agreement, and (ii) are not -derivative works of the Program. - -"Contributor" means any person or entity that distributes the Program. - -"Licensed Patents " mean patent claims licensable by a Contributor which are -necessarily infringed by the use or sale of its Contribution alone or when -combined with the Program. - -"Program" means the Contributions distributed in accordance with this Agreement. - -"Recipient" means anyone who receives the Program under this Agreement, -including all Contributors. - -2. GRANT OF RIGHTS - -a) Subject to the terms of this Agreement, each Contributor hereby grants -Recipient a non-exclusive, worldwide, royalty-free copyright license to -reproduce, prepare derivative works of, publicly display, publicly perform, -distribute and sublicense the Contribution of such Contributor, if any, and such -derivative works, in source code and object code form. - -b) Subject to the terms of this Agreement, each Contributor hereby grants -Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed -Patents to make, use, sell, offer to sell, import and otherwise transfer the -Contribution of such Contributor, if any, in source code and object code form. -This patent license shall apply to the combination of the Contribution and the -Program if, at the time the Contribution is added by the Contributor, such -addition of the Contribution causes such combination to be covered by the -Licensed Patents. The patent license shall not apply to any other combinations -which include the Contribution. No hardware per se is licensed hereunder. - -c) Recipient understands that although each Contributor grants the licenses to -its Contributions set forth herein, no assurances are provided by any -Contributor that the Program does not infringe the patent or other intellectual -property rights of any other entity. Each Contributor disclaims any liability to -Recipient for claims brought by any other entity based on infringement of -intellectual property rights or otherwise. As a condition to exercising the -rights and licenses granted hereunder, each Recipient hereby assumes sole -responsibility to secure any other intellectual property rights needed, if any. -For example, if a third party patent license is required to allow Recipient to -distribute the Program, it is Recipient's responsibility to acquire that license -before distributing the Program. - -d) Each Contributor represents that to its knowledge it has sufficient copyright -rights in its Contribution, if any, to grant the copyright license set forth in -this Agreement. - -3. REQUIREMENTS - -A Contributor may choose to distribute the Program in object code form under its -own license agreement, provided that: - -a) it complies with the terms and conditions of this Agreement; and - -b) its license agreement: - -i) effectively disclaims on behalf of all Contributors all warranties and -conditions, express and implied, including warranties or conditions of title and -non-infringement, and implied warranties or conditions of merchantability and -fitness for a particular purpose; - -ii) effectively excludes on behalf of all Contributors all liability for -damages, including direct, indirect, special, incidental and consequential -damages, such as lost profits; - -iii) states that any provisions which differ from this Agreement are offered by -that Contributor alone and not by any other party; and - -iv) states that source code for the Program is available from such Contributor, -and informs licensees how to obtain it in a reasonable manner on or through a -medium customarily used for software exchange. - -When the Program is made available in source code form: - -a) it must be made available under this Agreement; and - -b) a copy of this Agreement must be included with each copy of the Program. - -Contributors may not remove or alter any copyright notices contained within the -Program. - -Each Contributor must identify itself as the originator of its Contribution, if -any, in a manner that reasonably allows subsequent Recipients to identify the -originator of the Contribution. - - -4. COMMERCIAL DISTRIBUTION - -Commercial distributors of software may accept certain responsibilities with -respect to end users, business partners and the like. While this license is -intended to facilitate the commercial use of the Program, the Contributor who -includes the Program in a commercial product offering should do so in a manner -which does not create potential liability for other Contributors. Therefore, if -a Contributor includes the Program in a commercial product offering, such -Contributor ("Commercial Contributor") hereby agrees to defend and indemnify -every other Contributor ("Indemnified Contributor") against any losses, damages -and costs (collectively "Losses") arising from claims, lawsuits and other legal -actions brought by a third party against the Indemnified Contributor to the -extent caused by the acts or omissions of such Commercial Contributor in -connection with its distribution of the Program in a commercial product -offering. The obligations in this section do not apply to any claims or Losses -relating to any actual or alleged intellectual property infringement. In order -to qualify, an Indemnified Contributor must: a) promptly notify the Commercial -Contributor in writing of such claim, and b) allow the Commercial Contributor to -control, and cooperate with the Commercial Contributor in, the defense and any -related settlement negotiations. The Indemnified Contributor may participate in -any such claim at its own expense. - -For example, a Contributor might include the Program in a commercial product -offering, Product X. That Contributor is then a Commercial Contributor. If that -Commercial Contributor then makes performance claims, or offers warranties -related to Product X, those performance claims and warranties are such -Commercial Contributor's responsibility alone. Under this section, the -Commercial Contributor would have to defend claims against the other -Contributors related to those performance claims and warranties, and if a court -requires any other Contributor to pay any damages as a result, the Commercial -Contributor must pay those damages. - -5. NO WARRANTY - -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR -IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, -NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each -Recipient is solely responsible for determining the appropriateness of using and -distributing the Program and assumes all risks associated with its exercise of -rights under this Agreement, including but not limited to the risks and costs of -program errors, compliance with applicable laws, damage to or loss of data, -programs or equipment, and unavailability or interruption of operations. - -6. DISCLAIMER OF LIABILITY - - -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY -CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST -PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS -GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -7. GENERAL - -If any provision of this Agreement is invalid or unenforceable under applicable -law, it shall not affect the validity or enforceability of the remainder of the -terms of this Agreement, and without further action by the parties hereto, such -provision shall be reformed to the minimum extent necessary to make such -provision valid and enforceable. - -If Recipient institutes patent litigation against a Contributor with respect to -a patent applicable to software (including a cross-claim or counterclaim in a -lawsuit), then any patent licenses granted by that Contributor to such Recipient -under this Agreement shall terminate as of the date such litigation is filed. In -addition, if Recipient institutes patent litigation against any entity -(including a cross-claim or counterclaim in a lawsuit) alleging that the Program -itself (excluding combinations of the Program with other software or hardware) -infringes such Recipient's patent(s), then such Recipient's rights granted under -Section 2(b) shall terminate as of the date such litigation is filed. - -All Recipient's rights under this Agreement shall terminate if it fails to -comply with any of the material terms or conditions of this Agreement and does -not cure such failure in a reasonable period of time after becoming aware of -such noncompliance. If all Recipient's rights under this Agreement terminate, -Recipient agrees to cease use and distribution of the Program as soon as -reasonably practicable. However, Recipient's obligations under this Agreement -and any licenses granted by Recipient relating to the Program shall continue and -survive. - -Everyone is permitted to copy and distribute copies of this Agreement, but in -order to avoid inconsistency the Agreement is copyrighted and may only be -modified in the following manner. The Agreement Steward reserves the right to -publish new versions (including revisions) of this Agreement from time to time. -No one other than the Agreement Steward has the right to modify this Agreement. -IBM is the initial Agreement Steward. IBM may assign the responsibility to serve -as the Agreement Steward to a suitable separate entity. Each new version of the -Agreement will be given a distinguishing version number. The Program (including -Contributions) may always be distributed subject to the version of the Agreement -under which it was received. In addition, after a new version of the Agreement -is published, Contributor may elect to distribute the Program (including its -Contributions) under the new version. Except as expressly stated in Sections -2(a) and 2(b) above, Recipient receives no rights or licenses to the -intellectual property of any Contributor under this Agreement, whether -expressly, by implication, estoppel or otherwise. All rights in the Program not -expressly granted under this Agreement are reserved. - -This Agreement is governed by the laws of the State of New York and the -intellectual property laws of the United States of America. No party to this -Agreement will bring a legal action under this Agreement more than one year -after the cause of action arose. Each party waives its rights to a jury trial in -any resulting litigation. diff --git a/junitlib/external/junit-4.12-notice.txt b/junitlib/external/junit-4.12-notice.txt new file mode 100644 index 000000000..952103043 --- /dev/null +++ b/junitlib/external/junit-4.12-notice.txt @@ -0,0 +1,2 @@ +JUnit 4.12 is licensed under EPL-v10. +See https://www.eclipse.org/legal/epl-v10.html. diff --git a/languages/src/META-INF/services/org.netbeans.modules.editor.settings.storage.spi.StorageFilter b/languages/src/META-INF/services/org.netbeans.modules.editor.settings.storage.spi.StorageFilter index b722103a4..17801106e 100644 --- a/languages/src/META-INF/services/org.netbeans.modules.editor.settings.storage.spi.StorageFilter +++ b/languages/src/META-INF/services/org.netbeans.modules.editor.settings.storage.spi.StorageFilter @@ -1,42 +1,18 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. +# http://www.apache.org/licenses/LICENSE-2.0 # -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. # -# Contributor(s): -# -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. org.netbeans.modules.languages.dataobject.LanguagesEditorKit$EditorSettings \ No newline at end of file diff --git a/languages/src/META-INF/services/org.netbeans.spi.editor.mimelookup.MimeLookupInitializer b/languages/src/META-INF/services/org.netbeans.spi.editor.mimelookup.MimeLookupInitializer index fec1f9517..861bd0567 100644 --- a/languages/src/META-INF/services/org.netbeans.spi.editor.mimelookup.MimeLookupInitializer +++ b/languages/src/META-INF/services/org.netbeans.spi.editor.mimelookup.MimeLookupInitializer @@ -1,42 +1,18 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. +# http://www.apache.org/licenses/LICENSE-2.0 # -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. # -# Contributor(s): -# -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. org.netbeans.modules.languages.dataobject.MimeLookupInitializerImpl \ No newline at end of file diff --git a/languages/src/META-INF/services/org.netbeans.spi.lexer.LanguageProvider b/languages/src/META-INF/services/org.netbeans.spi.lexer.LanguageProvider index 4af99faa2..3a2d2c95e 100644 --- a/languages/src/META-INF/services/org.netbeans.spi.lexer.LanguageProvider +++ b/languages/src/META-INF/services/org.netbeans.spi.lexer.LanguageProvider @@ -1,42 +1,18 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. +# http://www.apache.org/licenses/LICENSE-2.0 # -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. # -# Contributor(s): -# -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. org.netbeans.modules.languages.lexer.SLanguageProvider \ No newline at end of file diff --git a/languages/test/qa-functional/data/OpenFileProj/build.xml b/languages/test/qa-functional/data/OpenFileProj/build.xml index 95ebb0d64..7756710be 100644 --- a/languages/test/qa-functional/data/OpenFileProj/build.xml +++ b/languages/test/qa-functional/data/OpenFileProj/build.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- You may freely edit this file. See commented blocks below for --> <!-- some examples of how to customize the build. --> <!-- (If you delete it and reopen the project it will be recreated.) --> diff --git a/languages/test/qa-functional/data/OpenFileProj/nbproject/project.properties b/languages/test/qa-functional/data/OpenFileProj/nbproject/project.properties index 526758f51..69d80327d 100644 --- a/languages/test/qa-functional/data/OpenFileProj/nbproject/project.properties +++ b/languages/test/qa-functional/data/OpenFileProj/nbproject/project.properties @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + build.classes.dir=${build.dir}/classes build.classes.excludes=**/*.java,**/*.form # This directory is removed when the project is cleaned: diff --git a/languages/test/qa-functional/data/OpenFileProj/nbproject/project.xml b/languages/test/qa-functional/data/OpenFileProj/nbproject/project.xml index ca395e437..56f5b931c 100644 --- a/languages/test/qa-functional/data/OpenFileProj/nbproject/project.xml +++ b/languages/test/qa-functional/data/OpenFileProj/nbproject/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.java.j2seproject</type> <configuration> diff --git a/lib.nbjshell9/build.xml b/lib.nbjshell9/build.xml index b75f3cb71..2e1b9226a 100644 --- a/lib.nbjshell9/build.xml +++ b/lib.nbjshell9/build.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project basedir="." default="netbeans" name="lib.nbjshell9"> <description>Builds, tests, and runs the project org.netbeans.lib.nbjshell9</description> <import file="../nbbuild/templates/projectized.xml"/> diff --git a/lib.nbjshell9/nbproject/project.properties b/lib.nbjshell9/nbproject/project.properties index 1ab7c178b..3a3208dca 100644 --- a/lib.nbjshell9/nbproject/project.properties +++ b/lib.nbjshell9/nbproject/project.properties @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + javac.source=1.8 javac.compilerargs=-Xlint -Xlint:-serial is.autoload=true diff --git a/lib.nbjshell9/nbproject/project.xml b/lib.nbjshell9/nbproject/project.xml index 404dac975..3804030d6 100644 --- a/lib.nbjshell9/nbproject/project.xml +++ b/lib.nbjshell9/nbproject/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.apisupport.project</type> <configuration> diff --git a/lib.profiler.ui/src/META-INF/services/org.netbeans.lib.profiler.ui.cpu.statistics.StatisticalModuleContainer b/lib.profiler.ui/src/META-INF/services/org.netbeans.lib.profiler.ui.cpu.statistics.StatisticalModuleContainer index 1c48e4873..03d49523b 100644 --- a/lib.profiler.ui/src/META-INF/services/org.netbeans.lib.profiler.ui.cpu.statistics.StatisticalModuleContainer +++ b/lib.profiler.ui/src/META-INF/services/org.netbeans.lib.profiler.ui.cpu.statistics.StatisticalModuleContainer @@ -1 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# org.netbeans.lib.profiler.ui.cpu.statistics.StatisticalModuleContainer \ No newline at end of file diff --git a/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.CPUCCTProvider b/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.CPUCCTProvider index bad09c361..0cfa17702 100644 --- a/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.CPUCCTProvider +++ b/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.CPUCCTProvider @@ -1 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# org.netbeans.lib.profiler.results.cpu.CPUCallGraphBuilder \ No newline at end of file diff --git a/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.CPUCCTProvider$Listener b/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.CPUCCTProvider$Listener index 56a7f48d1..0ee7288a9 100644 --- a/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.CPUCCTProvider$Listener +++ b/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.CPUCCTProvider$Listener @@ -1 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# org.netbeans.lib.profiler.results.cpu.FlatProfileBuilder \ No newline at end of file diff --git a/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.CPUProfilingResultListener b/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.CPUProfilingResultListener index 18f42bc4f..1b3767972 100644 --- a/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.CPUProfilingResultListener +++ b/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.CPUProfilingResultListener @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# org.netbeans.lib.profiler.results.cpu.CPUCallGraphBuilder org.netbeans.lib.profiler.results.locks.LockGraphBuilder$CPULockGraphBuilder org.netbeans.lib.profiler.results.jdbc.JdbcGraphBuilder \ No newline at end of file diff --git a/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.FlatProfileBuilder b/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.FlatProfileBuilder index 56a7f48d1..0ee7288a9 100644 --- a/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.FlatProfileBuilder +++ b/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.FlatProfileBuilder @@ -1 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# org.netbeans.lib.profiler.results.cpu.FlatProfileBuilder \ No newline at end of file diff --git a/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.cct.CCTResultsFilter b/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.cct.CCTResultsFilter index 2485c31da..99716ef92 100644 --- a/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.cct.CCTResultsFilter +++ b/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.cct.CCTResultsFilter @@ -1 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# org.netbeans.lib.profiler.results.cpu.cct.CCTResultsFilter \ No newline at end of file diff --git a/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.cct.TimeCollector b/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.cct.TimeCollector index 199f15410..bfb5993c7 100644 --- a/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.cct.TimeCollector +++ b/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.cct.TimeCollector @@ -1 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# org.netbeans.lib.profiler.results.cpu.cct.TimeCollector \ No newline at end of file diff --git a/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.marking.MarkingEngine$StateObserver b/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.marking.MarkingEngine$StateObserver index 199f15410..bfb5993c7 100644 --- a/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.marking.MarkingEngine$StateObserver +++ b/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.cpu.marking.MarkingEngine$StateObserver @@ -1 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# org.netbeans.lib.profiler.results.cpu.cct.TimeCollector \ No newline at end of file diff --git a/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.locks.LockProfilingResultListener b/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.locks.LockProfilingResultListener index 7c1f5a732..4cf6f0535 100644 --- a/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.locks.LockProfilingResultListener +++ b/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.locks.LockProfilingResultListener @@ -1 +1,18 @@ -org.netbeans.lib.profiler.results.locks.LockGraphBuilder +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +org.netbeans.lib.profiler.results.locks.LockGraphBuilder \ No newline at end of file diff --git a/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.memory.MemoryProfilingResultsListener b/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.memory.MemoryProfilingResultsListener index 94db446bb..5efeb4a64 100644 --- a/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.memory.MemoryProfilingResultsListener +++ b/lib.profiler/src/META-INF/services/org.netbeans.lib.profiler.results.memory.MemoryProfilingResultsListener @@ -1,2 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# org.netbeans.lib.profiler.results.memory.MemoryCallGraphBuilder -org.netbeans.lib.profiler.results.locks.LockGraphBuilder$MemoryLockGraphBuilder +org.netbeans.lib.profiler.results.locks.LockGraphBuilder$MemoryLockGraphBuilder \ No newline at end of file diff --git a/lib.profiler/test/qa-functional/data/projects/j2se-simple/build.xml b/lib.profiler/test/qa-functional/data/projects/j2se-simple/build.xml index 93e129e04..40874ecc0 100644 --- a/lib.profiler/test/qa-functional/data/projects/j2se-simple/build.xml +++ b/lib.profiler/test/qa-functional/data/projects/j2se-simple/build.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- You may freely edit this file. See commented blocks below for --> <!-- some examples of how to customize the build. --> <!-- (If you delete it and reopen the project it will be recreated.) --> diff --git a/lib.profiler/test/qa-functional/data/projects/j2se-simple/nbproject/project.properties b/lib.profiler/test/qa-functional/data/projects/j2se-simple/nbproject/project.properties index 1c53b62ed..ee74f1c13 100644 --- a/lib.profiler/test/qa-functional/data/projects/j2se-simple/nbproject/project.properties +++ b/lib.profiler/test/qa-functional/data/projects/j2se-simple/nbproject/project.properties @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + application.args= application.title=j2se-simple application.vendor=jb198685 diff --git a/lib.profiler/test/qa-functional/data/projects/j2se-simple/nbproject/project.xml b/lib.profiler/test/qa-functional/data/projects/j2se-simple/nbproject/project.xml index 47b8a8b98..165530fb3 100644 --- a/lib.profiler/test/qa-functional/data/projects/j2se-simple/nbproject/project.xml +++ b/lib.profiler/test/qa-functional/data/projects/j2se-simple/nbproject/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.java.j2seproject</type> <configuration> diff --git a/lib.terminalemulator/ReleaseNotes.ivan.txt b/lib.terminalemulator/ReleaseNotes.ivan.txt index 68d7d35d3..ffb1f4ce3 100644 --- a/lib.terminalemulator/ReleaseNotes.ivan.txt +++ b/lib.terminalemulator/ReleaseNotes.ivan.txt @@ -1,3 +1,5 @@ +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0. + 242273 PARTFIX Please support 256 Colors in Terminal xterm-16color @@ -2554,3 +2556,4 @@ tag: term_aug2001_ivan_1 Per NB folks' request. You should be able to get rid of expandTabs() in org/netbeans/core/output/OutputTabTerm.java. + diff --git a/lib.terminalemulator/doc-files/keyboard b/lib.terminalemulator/doc-files/keyboard index b9fb4e314..d824380c0 100644 --- a/lib.terminalemulator/doc-files/keyboard +++ b/lib.terminalemulator/doc-files/keyboard @@ -1,3 +1,5 @@ +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0. + 6 key editing group ------------------- Insert Insert VK_INSERT \ESC[2~ @@ -93,3 +95,5 @@ Tab Modifier parameters? -------------------- Yup, it's real ... + + diff --git a/lib.terminalemulator/doc-files/sequences b/lib.terminalemulator/doc-files/sequences index 33648b880..24dbfb02f 100644 --- a/lib.terminalemulator/doc-files/sequences +++ b/lib.terminalemulator/doc-files/sequences @@ -1,3 +1,5 @@ +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0. + infocmp -C termcap Compatibility -1 1 entry per line @@ -340,3 +342,5 @@ ACS_STERLING '}' 234 '}' '}' ansi+protoansix ACS_BULLET '~' 376 '~' '~' ansi+protoansix ---------------------------------------------------------------------------------------------------------------------------------------- sequence mnemonic termcap op terminfo numbers margin ansi dtterm xterm Term + + diff --git a/lib.terminalemulator/examples/README b/lib.terminalemulator/examples/README index c6feaa157..8b9396adc 100644 --- a/lib.terminalemulator/examples/README +++ b/lib.terminalemulator/examples/README @@ -1,3 +1,5 @@ +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0. + "README" Current examples @@ -27,3 +29,4 @@ buildtool telnet An old telnet application that depends on an external (not supplied) Java telnet library. + diff --git a/lib.terminalemulator/examples/TermApp/release/nbterm b/lib.terminalemulator/examples/TermApp/release/nbterm index 42d9ad741..7583fe687 100755 --- a/lib.terminalemulator/examples/TermApp/release/nbterm +++ b/lib.terminalemulator/examples/TermApp/release/nbterm @@ -1,47 +1,22 @@ #!/bin/bash # nterm -- A simple Java based ANSI terminal emulator -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. +# http://www.apache.org/licenses/LICENSE-2.0 # -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# Contributor(s): -# -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. if [ -h $0 ] diff --git a/lib.terminalemulator/examples/TermApp/release/nbterm64 b/lib.terminalemulator/examples/TermApp/release/nbterm64 index 5363bf4f5..96e6d58b3 100644 --- a/lib.terminalemulator/examples/TermApp/release/nbterm64 +++ b/lib.terminalemulator/examples/TermApp/release/nbterm64 @@ -1,48 +1,22 @@ #!/bin/bash # nterm -- A simple Java based ANSI terminal emulator -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. +# http://www.apache.org/licenses/LICENSE-2.0 # -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# Contributor(s): -# -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. - +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. if [ -h $0 ] then diff --git a/lib.terminalemulator/examples/TermExample/make_filter.awk b/lib.terminalemulator/examples/TermExample/make_filter.awk index 5597a0fea..c75bcf6be 100644 --- a/lib.terminalemulator/examples/TermExample/make_filter.awk +++ b/lib.terminalemulator/examples/TermExample/make_filter.awk @@ -1,6 +1,24 @@ # "make_filter.awk" # Convert errors and warnings to Term hyperlinks +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + + /^.*:[[:digit:]]+: warning: / { printf "]10;WARNING;" printf $0 diff --git a/lib.terminalemulator/examples/TermTester/nbproject/project.properties b/lib.terminalemulator/examples/TermTester/nbproject/project.properties index bb84ab499..87df27e4f 100644 --- a/lib.terminalemulator/examples/TermTester/nbproject/project.properties +++ b/lib.terminalemulator/examples/TermTester/nbproject/project.properties @@ -1,40 +1,20 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved. +# http://www.apache.org/licenses/LICENSE-2.0 # -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. -# -# Contributor(s): +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + #Mon Aug 01 23:29:35 PDT 2016 javadoc.splitindex=true build.classes.excludes=**/*.java,**/*.form diff --git a/lib.terminalemulator/examples/buildtool/README b/lib.terminalemulator/examples/buildtool/README index 88f8d91e4..2f909814f 100644 --- a/lib.terminalemulator/examples/buildtool/README +++ b/lib.terminalemulator/examples/buildtool/README @@ -1,3 +1,21 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + + A simple build tool application =============================== diff --git a/lib.terminalemulator/examples/buildtool/buildtool b/lib.terminalemulator/examples/buildtool/buildtool index cf234f9fc..20a5bf4e4 100644 --- a/lib.terminalemulator/examples/buildtool/buildtool +++ b/lib.terminalemulator/examples/buildtool/buildtool @@ -1,3 +1,21 @@ #!/bin/ksh + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + TERM=../../build/classes java -classpath "classes:$TERM" BuildTool $* diff --git a/lib.terminalemulator/examples/lib.richexecution/maintainers.properties b/lib.terminalemulator/examples/lib.richexecution/maintainers.properties index 70f180c5f..4f2b6fbf1 100644 --- a/lib.terminalemulator/examples/lib.richexecution/maintainers.properties +++ b/lib.terminalemulator/examples/lib.richexecution/maintainers.properties @@ -1,40 +1,20 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved. +# http://www.apache.org/licenses/LICENSE-2.0 # -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. # -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. -# -# Contributor(s): # "maintainers.properties" -- Define the maintainers property # Builds work differently for maintainers of this project. diff --git a/lib.terminalemulator/examples/lib.richexecution/process_start.cat b/lib.terminalemulator/examples/lib.richexecution/process_start.cat index 8485725b5..9b7258780 100644 --- a/lib.terminalemulator/examples/lib.richexecution/process_start.cat +++ b/lib.terminalemulator/examples/lib.richexecution/process_start.cat @@ -1,3 +1,5 @@ +Licensed to the Apache Software Foundation (ASF) under one or more contributor +license agreements; and to You under the Apache License, Version 2.0. process_start(1) process_start(1) @@ -54,3 +56,17 @@ DESCRIPTION which is inherited by children processes. process_start.sh cannot do this. + +LICENSE + + Licensed under the Apache License, Version 2.0 (the "License"); you may not use + this file except in compliance with the License. You may obtain a copy of the + License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software distributed + under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + CONDITIONS OF ANY KIND, either express or implied. See the License for the + specific language governing permissions and limitations under the License. + diff --git a/lib.terminalemulator/examples/telnet/README b/lib.terminalemulator/examples/telnet/README index 4ec5a2943..5009a3ee0 100644 --- a/lib.terminalemulator/examples/telnet/README +++ b/lib.terminalemulator/examples/telnet/README @@ -1,3 +1,21 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + + A simple telnet application =========================== diff --git a/lib.terminalemulator/examples/telnet/telnet b/lib.terminalemulator/examples/telnet/telnet index 7985c5f38..7607418dc 100644 --- a/lib.terminalemulator/examples/telnet/telnet +++ b/lib.terminalemulator/examples/telnet/telnet @@ -1,3 +1,21 @@ #!/bin/ksh + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + TERM=../../build/classes java -classpath "classes:$TERM" TelnetApp $* diff --git a/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/support/Bundle.properties b/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/support/Bundle.properties index 49334643d..dbdb8c203 100644 --- a/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/support/Bundle.properties +++ b/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/support/Bundle.properties @@ -1,40 +1,19 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved. +# http://www.apache.org/licenses/LICENSE-2.0 # -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. -# -# Contributor(s): +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. # # FindBar # diff --git a/libs.cglib/external/binaries-list b/libs.cglib/external/binaries-list index f72b24c91..f127256a3 100644 --- a/libs.cglib/external/binaries-list +++ b/libs.cglib/external/binaries-list @@ -14,4 +14,4 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -97D03461DC1C04FFC636DCB2579AAE7724A78EF2 cglib-2.2.jar +97D03461DC1C04FFC636DCB2579AAE7724A78EF2 cglib:cglib:2.2 diff --git a/libs.cglib/external/cglib-2.2-notice.txt b/libs.cglib/external/cglib-2.2-notice.txt new file mode 100644 index 000000000..3f59805ce --- /dev/null +++ b/libs.cglib/external/cglib-2.2-notice.txt @@ -0,0 +1,2 @@ +This product includes software developed by +The Apache Software Foundation (http://www.apache.org/). diff --git a/libs.jvyamlb/external/binaries-list b/libs.jvyamlb/external/binaries-list index 667505006..24ddaa9d3 100644 --- a/libs.jvyamlb/external/binaries-list +++ b/libs.jvyamlb/external/binaries-list @@ -14,4 +14,4 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -ED45F5C56EC70CC77936E92B43B6F32F46E6F4B3 jvyamlb-0.2.7.jar +C8E994189BA694D5A07706C401D6FE8D8375A38A org.jruby.extras:jvyamlb:0.2.6 diff --git a/libs.jvyamlb/external/jvyamlb-0.2.6-license.txt b/libs.jvyamlb/external/jvyamlb-0.2.6-license.txt new file mode 100644 index 000000000..20264b58b --- /dev/null +++ b/libs.jvyamlb/external/jvyamlb-0.2.6-license.txt @@ -0,0 +1,19 @@ +Copyright (c) 2008 Ola Bini <ola.bini@gmail.com> + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/libs.jvyamlb/nbproject/project.properties b/libs.jvyamlb/nbproject/project.properties index 5814a0bd8..f6e57f8d3 100644 --- a/libs.jvyamlb/nbproject/project.properties +++ b/libs.jvyamlb/nbproject/project.properties @@ -16,6 +16,6 @@ # under the License. is.autoload=true -release.external/jvyamlb-0.2.7.jar=modules/ext/jvyamlb-0.2.7.jar +release.external/jvyamlb-0.2.6.jar=modules/ext/jvyamlb-0.2.6.jar sigtest.gen.fail.on.error=false diff --git a/libs.jvyamlb/nbproject/project.xml b/libs.jvyamlb/nbproject/project.xml index 02833483a..7caaf1f48 100644 --- a/libs.jvyamlb/nbproject/project.xml +++ b/libs.jvyamlb/nbproject/project.xml @@ -58,8 +58,8 @@ <subpackages>org.jvyamlb</subpackages> </public-packages> <class-path-extension> - <runtime-relative-path>ext/jvyamlb-0.2.7.jar</runtime-relative-path> - <binary-origin>external/jvyamlb-0.2.7.jar</binary-origin> + <runtime-relative-path>ext/jvyamlb-0.2.6.jar</runtime-relative-path> + <binary-origin>external/jvyamlb-0.2.6.jar</binary-origin> </class-path-extension> </data> </configuration> diff --git a/libs.smack/external/binaries-list b/libs.smack/external/binaries-list index 92f51576a..f7ecda91c 100644 --- a/libs.smack/external/binaries-list +++ b/libs.smack/external/binaries-list @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -916A0FE08D840A08C950F49FB59B961E14D673B8 smack.jar -BA1365C7E5F3CF7F7641B354677B3F54A6EA5A15 smackx.jar +916A0FE08D840A08C950F49FB59B961E14D673B8 jivesoftware:smack:3.1.0 +BA1365C7E5F3CF7F7641B354677B3F54A6EA5A15 jivesoftware:smackx:3.1.0 diff --git a/libs.smack/nbproject/project.properties b/libs.smack/nbproject/project.properties index f84d0817c..25e3acbe3 100644 --- a/libs.smack/nbproject/project.properties +++ b/libs.smack/nbproject/project.properties @@ -21,5 +21,5 @@ is.autoload=true sigtest.gen.fail.on.error=false license.file=${basedir}/README.html -release.external/smack.jar=modules/ext/smack.jar -release.external/smackx.jar=modules/ext/smackx.jar +release.external/smack-3.1.0.jar=modules/ext/smack.jar +release.external/smackx-3.1.0.jar=modules/ext/smackx.jar diff --git a/libs.smack/nbproject/project.xml b/libs.smack/nbproject/project.xml index de3ed14ef..1d15265c6 100644 --- a/libs.smack/nbproject/project.xml +++ b/libs.smack/nbproject/project.xml @@ -57,11 +57,11 @@ </public-packages> <class-path-extension> <runtime-relative-path>ext/smack.jar</runtime-relative-path> - <binary-origin>external/smack.jar</binary-origin> + <binary-origin>external/smack-3.1.0.jar</binary-origin> </class-path-extension> <class-path-extension> <runtime-relative-path>ext/smackx.jar</runtime-relative-path> - <binary-origin>external/smackx.jar</binary-origin> + <binary-origin>external/smackx-3.1.0.jar</binary-origin> </class-path-extension> </data> </configuration> diff --git a/libs.xerces/external/binaries-list b/libs.xerces/external/binaries-list index 072f5cc09..afc7766ef 100644 --- a/libs.xerces/external/binaries-list +++ b/libs.xerces/external/binaries-list @@ -14,4 +14,4 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -6E60617C9D81EA1EF96913C226900BC2D1E69C37 xerces-2.8.0.jar +CFD3EBE2F8034E660344F9108C3E2DAF78C29CC3 xerces:xercesImpl:2.8.0 diff --git a/libs.xerces/external/xerces-2.8.0-notice.txt b/libs.xerces/external/xerces-2.8.0-notice.txt new file mode 100644 index 000000000..c8147414b --- /dev/null +++ b/libs.xerces/external/xerces-2.8.0-notice.txt @@ -0,0 +1,15 @@ + ========================================================================= + == NOTICE file corresponding to section 4(d) of the Apache License, == + == Version 2.0, in this case for the Apache Xerces distribution. == + ========================================================================= + + This product includes software developed by + The Apache Software Foundation (http://www.apache.org/). + + Portions of this software were originally based on the following: + - software copyright (c) 1999, IBM Corporation., http://www.ibm.com. + - software copyright (c) 1999, Sun Microsystems., http://www.sun.com. + - voluntary contributions made by Paul Eng on behalf of the + Apache Software Foundation that were originally developed at iClick, Inc., + software copyright (c) 1999. + diff --git a/libs.xerces/nbproject/project.properties b/libs.xerces/nbproject/project.properties index 343b96d0f..e827bea1e 100644 --- a/libs.xerces/nbproject/project.properties +++ b/libs.xerces/nbproject/project.properties @@ -16,6 +16,6 @@ # under the License. is.autoload=true -release.external/xerces-2.8.0.jar=modules/ext/xerces-2.8.0.jar +release.external/xercesImpl-2.8.0.jar=modules/ext/xerces-2.8.0.jar module.jar.verifylinkageignores=org.apache.xerces.util.XMLCatalogResolver spec.version.base=1.39.0 diff --git a/localhistory/test/qa-functional/data/JavaApp/build.xml b/localhistory/test/qa-functional/data/JavaApp/build.xml index d7f3d7c3b..b3fb4819a 100644 --- a/localhistory/test/qa-functional/data/JavaApp/build.xml +++ b/localhistory/test/qa-functional/data/JavaApp/build.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- You may freely edit this file. See commented blocks below for --> <!-- some examples of how to customize the build. --> <!-- (If you delete it and reopen the project it will be recreated.) --> diff --git a/localhistory/test/qa-functional/data/JavaApp/nbproject/project.properties b/localhistory/test/qa-functional/data/JavaApp/nbproject/project.properties index 3113782ef..1b4fcecff 100644 --- a/localhistory/test/qa-functional/data/JavaApp/nbproject/project.properties +++ b/localhistory/test/qa-functional/data/JavaApp/nbproject/project.properties @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + build.classes.dir=${build.dir}/classes build.classes.excludes=**/*.java,**/*.form # This directory is removed when the project is cleaned: diff --git a/localhistory/test/qa-functional/data/JavaApp/nbproject/project.xml b/localhistory/test/qa-functional/data/JavaApp/nbproject/project.xml index 63c24754b..214d73868 100644 --- a/localhistory/test/qa-functional/data/JavaApp/nbproject/project.xml +++ b/localhistory/test/qa-functional/data/JavaApp/nbproject/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.java.j2seproject</type> <configuration> diff --git a/maven.embedder/external/binaries-list b/maven.embedder/external/binaries-list index 67ae6595c..ecfe9375b 100644 --- a/maven.embedder/external/binaries-list +++ b/maven.embedder/external/binaries-list @@ -14,6 +14,6 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -A2AC1CD690AB4C80DEFE7F9BCE14D35934C35CEC jdom-1.0.jar -BF206C4AA93C74A739FBAF1F1C78E3AD5F167245 maven-dependency-tree-2.0.jar -2DDF9BB8C3B41BC2891832A6D6FC25F8BF41D77F apache-maven-3.3.9-bin.zip +A2AC1CD690AB4C80DEFE7F9BCE14D35934C35CEC jdom:jdom:1.0 +BF206C4AA93C74A739FBAF1F1C78E3AD5F167245 org.apache.maven.shared:maven-dependency-tree:2.0 +2DDF9BB8C3B41BC2891832A6D6FC25F8BF41D77F org.apache.maven:apache-maven:3.3.9:bin@zip diff --git a/maven.embedder/external/jdom-1.0-notice.txt b/maven.embedder/external/jdom-1.0-notice.txt new file mode 100644 index 000000000..c12ab305b --- /dev/null +++ b/maven.embedder/external/jdom-1.0-notice.txt @@ -0,0 +1,49 @@ +Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +1. Redistributions of source code must retain the above copyright + notice, this list of conditions, and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions, and the disclaimer that follows + these conditions in the documentation and/or other materials + provided with the distribution. + +3. The name "JDOM" must not be used to endorse or promote products + derived from this software without prior written permission. For + written permission, please contact <request_AT_jdom_DOT_org>. + +4. Products derived from this software may not be called "JDOM", nor + may "JDOM" appear in their name, without prior written permission + from the JDOM Project Management <request_AT_jdom_DOT_org>. + +In addition, we request (but do not require) that you include in the +end-user documentation provided with the redistribution and/or in the +software itself an acknowledgement equivalent to the following: + "This product includes software developed by the + JDOM Project (http://www.jdom.org/)." +Alternatively, the acknowledgment may be graphical using the logos +available at http://www.jdom.org/images/logos. + +THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF +USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. + +This software consists of voluntary contributions made by many +individuals on behalf of the JDOM Project and was originally +created by Jason Hunter <jhunter_AT_jdom_DOT_org> and +Brett McLaughlin <brett_AT_jdom_DOT_org>. For more information +on the JDOM Project, please see <http://www.jdom.org/>. diff --git a/maven.model/test/unit/src/profiles.xml b/maven.model/test/unit/src/profiles.xml index 2f7eb3008..1ae4dcdcd 100644 --- a/maven.model/test/unit/src/profiles.xml +++ b/maven.model/test/unit/src/profiles.xml @@ -1,5 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<!-- Project-local overrides to the build process based on detected or user-provided environmental parameters. --> <profilesXml xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" diff --git a/maven.model/test/unit/src/settings.xml b/maven.model/test/unit/src/settings.xml index 8e16bfd39..b23c97986 100644 --- a/maven.model/test/unit/src/settings.xml +++ b/maven.model/test/unit/src/settings.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <settings> <servers> <server> diff --git a/mercurial/l10n.list b/mercurial/l10n.list index e7f9a9bf6..11cf688b6 100644 --- a/mercurial/l10n.list +++ b/mercurial/l10n.list @@ -1,2 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. # mercurial/main read global diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/RatReportTask.java b/nbbuild/antsrc/org/netbeans/nbbuild/RatReportTask.java new file mode 100644 index 000000000..b22b2fea7 --- /dev/null +++ b/nbbuild/antsrc/org/netbeans/nbbuild/RatReportTask.java @@ -0,0 +1,319 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.netbeans.nbbuild; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeMap; +import java.util.TreeSet; +import java.util.logging.Level; +import java.util.logging.Logger; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.xpath.XPath; +import javax.xml.xpath.XPathConstants; +import javax.xml.xpath.XPathExpressionException; +import javax.xml.xpath.XPathFactory; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Task; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; + +/** + * Build JUnit report from Apache Ant Report XXX + * + * @author skygo + */ +public class RatReportTask extends Task { + + private File sourceFile; + private File root; + // not nice but to be last + private static final String OTHERS_AREA = "not cluster"; + private static final String NOT_CLUSTER = "not under cluster"; + private File reportFile; + + /** + * source file Apache Rat xml report + * + * @param sourceFile + */ + public void setSource(File sourceFile) { + this.sourceFile = sourceFile; + } + + /** + * Folder to put the rat reports in + * + * @param report + */ + public void setReport(File report) { + this.reportFile = report; + } + + @Override + public void execute() throws BuildException { + root = sourceFile.getParentFile().getParentFile().getParentFile(); + File[] modulesFolder = root.listFiles(); + String repository = ""; + // get repository information from git + //try { + List<String> commandAndArgs = new ArrayList<>(); + commandAndArgs.add("git"); + commandAndArgs.add("config"); + commandAndArgs.add("--get"); + commandAndArgs.add("remote.origin.url"); + try { + Process p = new ProcessBuilder(commandAndArgs).directory(root).start(); + try (BufferedReader r = new BufferedReader(new InputStreamReader(p.getInputStream()))) { + String line; + while ((line = r.readLine()) != null) { + if (line.startsWith("http")) { + repository = line.replace(".git", ""); + } + } + } catch (IOException ex) { + throw new BuildException("Cannot evaluate git information", ex); + } + } catch (IOException ex) { + throw new BuildException("git process issue", ex); + } + // map module and report + Map<String, ModuleInfo> moduleRATInfo = new TreeMap<>(); + + // build map to get cluster and module related from cluster.properties + Set<String> moduleDB = new HashSet<>(); + Map<String, Set<String>> modulebycluster = new TreeMap<>(); + for (File module : modulesFolder) { + if (module.isDirectory() && !module.isHidden()) { + moduleDB.add(module.getName()); + moduleRATInfo.put(module.getName(), new ModuleInfo(module)); + } + } + Set<String> clusterList = new TreeSet<>(); + for (String key : getProject().getProperties().keySet()) { + if (key.startsWith("nb.cluster.")) { + String simplfiedKey = key.replaceAll("nb.cluster.", ""); + simplfiedKey = simplfiedKey.replaceAll(".dir", ""); + simplfiedKey = simplfiedKey.replaceAll(".depends", ""); + clusterList.add(simplfiedKey); + modulebycluster.put(simplfiedKey, new HashSet<String>()); + } + } + for (String clusterName : clusterList) { + String property = getProject().getProperty("nb.cluster." + clusterName); + String[] split = property.split(","); + for (String amo : split) { + moduleDB.remove(amo); + modulebycluster.get(clusterName).add(amo); + } + } + modulebycluster.put(OTHERS_AREA, new HashSet<String>()); + for (String k : moduleDB) { + modulebycluster.get(OTHERS_AREA).add(k); + } + // remaining module sorted in others + modulebycluster.get(OTHERS_AREA).add(NOT_CLUSTER); + clusterList.add(OTHERS_AREA); + moduleRATInfo.put(NOT_CLUSTER, new ModuleInfo(root)); + //read XML + try { + DocumentBuilder dBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder(); + InputStream inputstream = new FileInputStream(sourceFile); + InputStreamReader reader = new InputStreamReader(inputstream); + InputSource inputSource = new InputSource(reader); + Document doc = dBuilder.parse(inputSource); // open xml source + XPathFactory xpf = XPathFactory.newInstance(); + + XPath path = xpf.newXPath(); + Element rootElement = doc.getDocumentElement(); + + doPopulateUnapproved(moduleRATInfo, rootElement, path); + doPopulateApproved(moduleRATInfo, rootElement, path); + + } catch (ParserConfigurationException | SAXException | IOException | XPathExpressionException ex) { + throw new BuildException("Cannot parse Rat report ", ex); + } + doCheckExternal(moduleRATInfo); + + for (String clusterName : clusterList) { + // create a report file by cluster + File file = new File(reportFile, clusterName + ".xml"); + if (!file.exists()) { + try { + reportFile.mkdirs(); + file.createNewFile(); + } catch (IOException ex) { + throw new BuildException("Impossible to create junit rat report for cluster " + clusterName, ex); + } + } + Map<String, String> pseudoTests = new LinkedHashMap<>(); + for (String moduleName : modulebycluster.get(clusterName)) { + ModuleInfo amoduleInfo = moduleRATInfo.get(moduleName); + if (amoduleInfo != null) { + if (!amoduleInfo.getUnapproved().isEmpty()) { + pseudoTests.put(" module " + moduleName + " has " + amoduleInfo.getUnapproved().size() + " unapproved license(s)", "Unapproved license in " + amoduleInfo.getUnapproved().size() + " file(s) " + writeFiles(amoduleInfo.getUnapproved(), repository)); + } + if (!amoduleInfo.getInvalidExternal().isEmpty()) { + pseudoTests.put(" module " + moduleName + " has " + amoduleInfo.getInvalidExternal().size() + " suspicious external binaries file(s)", "List of file " + amoduleInfo.getInvalidExternal().size() + " file(s) " + writeFiles(amoduleInfo.getInvalidExternal(), null)); + } + } else { + // XXX if a moduleInfo is null folder is not present source base incomplete + } + + } + JUnitReportWriter.writeReport(this, "Cluster: " + clusterName, file, pseudoTests); + } + } + + private static String writeFiles(Set<String> listFile, String repo) { + StringBuilder sb = new StringBuilder(); + for (String fileentry : listFile) { + sb.append("\n"); + if (repo != null) { + sb.append(repo).append("/tree/master/"); + } + sb.append(fileentry.replaceAll(" ", "%20")); + } + return sb.toString(); + } + + private void doPopulateUnapproved(Map<String, ModuleInfo> moduleRATInfo, Element rootElement, XPath path) throws XPathExpressionException { + NodeList evaluate = (NodeList) path.evaluate("descendant::resource[license-approval/@name=\"false\"]", rootElement, XPathConstants.NODESET); + for (int i = 0; i < evaluate.getLength(); i++) { + String resources = evaluate.item(i).getAttributes().getNamedItem("name").getTextContent().replaceFirst(root.getPath() + File.separator, ""); + String moduleName = getModuleName(resources); + if (!moduleRATInfo.containsKey(moduleName)) { + moduleRATInfo.get(NOT_CLUSTER).addUnapproved(resources); + } else { + moduleRATInfo.get(moduleName).addUnapproved(resources); + } + } + } + + private void doPopulateApproved(Map<String, ModuleInfo> moduleRATInfo, Element rootElement, XPath path) throws XPathExpressionException { + NodeList evaluate = (NodeList) path.evaluate("descendant::resource[license-approval/@name=\"true\"]", rootElement, XPathConstants.NODESET); + for (int i = 0; i < evaluate.getLength(); i++) { + String resources = evaluate.item(i).getAttributes().getNamedItem("name").getTextContent().replaceFirst(root.getPath() + File.separator, ""); + String moduleName = getModuleName(resources); + if (!moduleRATInfo.containsKey(moduleName)) { + moduleRATInfo.get(NOT_CLUSTER).addApproved(resources); + } else { + moduleRATInfo.get(moduleName).addApproved(resources); + } + + } + } + + private void doCheckExternal(Map<String, ModuleInfo> moduleRATInfo) { + for (Map.Entry<String, ModuleInfo> minfo : moduleRATInfo.entrySet()) { + File binaryList = new File(minfo.getValue().getFolder(), File.separator + "external" + File.separator + "binaries-list"); + if (binaryList.exists()) { + try (BufferedReader br = new BufferedReader(new FileReader(binaryList))) { + String line = br.readLine(); + while (line != null) { + if (line.trim().startsWith("#") || line.trim().isEmpty()) { + // comment + } else { + String[] splitedExternalInfo = line.split(" "); + + String[] mavenizedExternal = splitedExternalInfo[1].split(":"); + if (mavenizedExternal.length != 3) { + minfo.getValue().addInvalidExternal(splitedExternalInfo[1]); + } + } + line = br.readLine(); + } + } catch (FileNotFoundException ex) { + Logger.getLogger(RatReportTask.class.getName()).log(Level.SEVERE, null, ex); + } catch (IOException ex) { + Logger.getLogger(RatReportTask.class.getName()).log(Level.SEVERE, null, ex); + } + + } + } + } + + private String getModuleName(String resource) { + String moduleName; + if (!resource.contains(File.separator)) { + moduleName = NOT_CLUSTER; + } else { + moduleName = resource.substring(0, resource.indexOf(File.separator)); + } + return moduleName; + } + + class ModuleInfo { +// approved resource list +// very simple string for now. + + private final Set<String> approved = new HashSet<>(); + // unapproved resource list + private final Set<String> unapproved = new HashSet<>(); + + private final Set<String> external = new HashSet<>(); + private final File folder; + + private ModuleInfo(File moduleFolder) { + this.folder = moduleFolder; + } + + private File getFolder() { + return folder; + } + + private void addApproved(String resources) { + approved.add(resources); + } + + private void addInvalidExternal(String resources) { + external.add(resources); + } + + private void addUnapproved(String resources) { + unapproved.add(resources); + } + + private Set<String> getUnapproved() { + return unapproved; + } + + private Set<String> getInvalidExternal() { + return external; + } + + } +} diff --git a/nbbuild/build.xml b/nbbuild/build.xml index fe1c439a3..d00436d00 100644 --- a/nbbuild/build.xml +++ b/nbbuild/build.xml @@ -151,11 +151,11 @@ <!-- Set up automatic all-* targets: --> <taskdef name="insert-module-all-targets" classname="org.netbeans.nbbuild.InsertModuleAllTargets" classpath="${nbantext.jar}"/> - <property name="verify.checkout" value="true"/> - <property name="init.use.clusters" value="true"/> + <property name="verify.checkout" value="true"/> + <property name="init.use.clusters" value="true"/> <insert-module-all-targets checkModules="${verify.checkout}" useclusters="${init.use.clusters}"/> </target> - + <target name="all-installer" description="Dummy target for build system compatibility"/> <target name="update" depends="init" description="Downloads binaries from an update center"> @@ -208,10 +208,10 @@ <property name="jnlp.signjar.alias" value="jnlp" /> <property name="jnlp.signjar.password" value="netbeans" /> <property name="jnlp.signjar.vendor" value="CN=NetBeans, OU=NetBeans, O=netbeans.org, C=US" /> - + <mkdir dir="${jnlp.signjar.keystore}/../" /> <echo message="Going to create default keystore in ${jnlp.signjar.keystore}" /> - <genkey + <genkey alias="${jnlp.signjar.alias}" keystore="${jnlp.signjar.keystore}" storepass="${jnlp.signjar.password}" @@ -246,7 +246,7 @@ <fileset dir="${jnlp.dest.dir}" includes="*.jnlp"/> </verifyjnlp> </target> - + <target name="build-javadoc"> <echo message="Deprecated, use nbbuild/javadoctools/build.xml directly"/> <ant dir="javadoctools" target="build-javadoc"/> @@ -255,13 +255,13 @@ <!-- build source zips for selected modules - useful for populating maven repository only--> <target name="build-source-zips" depends="init" description="Builds source zips for maven repository inclusion."> <property name="netbeans.zipped.sources.dir" location="${nb.build.dir}/source-zips" /> - + <subant-junit target="sources-zip" failonerror="true"> <buildpath path="${modules.sorted}"/> </subant-junit> </target> - - + + <target name="check-javahelpbin" depends="init" description="Validate intermodule links in helpsets."> <taskdef name="checkhelpsetsbin" classname="org.netbeans.nbbuild.CheckHelpSetsBin"> <classpath> @@ -284,7 +284,7 @@ <echo message="OS: ${os.name} ${os.version} Locale: ${user.language}_${user.region}"/> <echo message="Java: ${nbjdk.home}"/> </target> - + <!-- Use of nbmerge target has the effect of automatically depending on all-X for every module. --> <!-- It also runs deltree(dir=wherever) and copydir(src=../X/netbeans,dest=wherever) to create the IDE install. --> @@ -311,8 +311,8 @@ <fixcrlf eol="lf" srcdir="${netbeans.dest.dir}" > <include name="etc/netbeans.conf" /> <include name="etc/netbeans.clusters" /> - <include name="bin/netbeans" /> - <include name="${nb.cluster.platform.dir}/lib/nbexec" /> + <include name="bin/netbeans" /> + <include name="${nb.cluster.platform.dir}/lib/nbexec" /> </fixcrlf> <mkdir dir="${nb.build.dir}"/> <hgid property="hg.id" file=".."/> @@ -369,21 +369,21 @@ Hg ID: ${hg.id} <antcall target="zip-cluster-config" inheritall="true"/> </target> - <target name="delete-and-merge" depends="merge-delete,merge" /> + <target name="delete-and-merge" depends="merge-delete,merge" /> <target name="merge-delete" depends="init"> <delete dir="${netbeans.dest}" /> </target> - + <target name="merge" depends="build-messaging"> <mkdir dir="${netbeans.dest.dir}"/> - <nbmerge failonerror="${stop.when.broken.modules}" - dest="${netbeans.dest}" - topdir=".." - fixedmodules="${fixedmodules}" + <nbmerge failonerror="${stop.when.broken.modules}" + dest="${netbeans.dest}" + topdir=".." + fixedmodules="${fixedmodules}" modules="${modules}" - builtmodulesproperty="${built.modules.property}" - targetprefix="all-" + builtmodulesproperty="${built.modules.property}" + targetprefix="all-" mergedependentmodules="${merge.dependent.modules}" > </nbmerge> </target> @@ -394,7 +394,7 @@ Hg ID: ${hg.id} <delete file="${netbeans.dest.dir}/nb.cluster.harness.built"/> <run-depend-build clusters-to-build="nb.cluster.platform,nb.cluster.harness"/> </target> - + <target name="build-platform" description="Build the NetBeans Platform (platform and harness clusters)."> <mkdir dir="${netbeans.dest.dir}"/> <ant dir="." target="-build-platform" inheritAll="false"> @@ -410,7 +410,7 @@ Hg ID: ${hg.id} <property name="test-unit-sys-prop.ignore.random.failures" value="true"/> </ant> </target> - + <target name="build-cluster" depends="init"> <run-depend-build clusters-to-build="${cluster-name}"/> </target> @@ -418,12 +418,12 @@ Hg ID: ${hg.id} <macrodef name="run-depend-build"> <attribute name="clusters-to-build"/> <sequential> - <repeat target="build-one-cluster" name="one.cluster.name" values="@{clusters-to-build}" /> + <repeat target="build-one-cluster" name="one.cluster.name" values="@{clusters-to-build}" /> </sequential> </macrodef> <target name="build-clusters" depends="init"> - <run-depend-build clusters-to-build="${nb.clusters.list}"/> + <run-depend-build clusters-to-build="${nb.clusters.list}"/> </target> <target name="build-one-cluster-dependencies-check"> @@ -433,10 +433,10 @@ Hg ID: ${hg.id} <resolve name="test.prop" value="${one.cluster.name}-hasNoDependencies"/> </target> - <target name="build-one-cluster-dependencies" + <target name="build-one-cluster-dependencies" depends="build-one-cluster-dependencies-check" unless="${one.cluster.name}-hasNoDependencies"> - <run-depend-build clusters-to-build="${one.cluster.dependencies}"/> + <run-depend-build clusters-to-build="${one.cluster.dependencies}"/> </target> <target name="build-one-cluster-check"> @@ -459,12 +459,12 @@ Hg ID: ${hg.id} <param name="ext.binaries.downloaded" value="true"/> </antcall> <mkdir dir="${netbeans.dest.dir}"/> - <nbmerge failonerror="${stop.when.broken.modules}" - dest="${netbeans.dest.dir}" - topdir="${nb_all}" + <nbmerge failonerror="${stop.when.broken.modules}" + dest="${netbeans.dest.dir}" + topdir="${nb_all}" fixedmodules="${one-cluster-modules}" - builtmodulesproperty="${built.modules.property}" - targetprefix="all-" + builtmodulesproperty="${built.modules.property}" + targetprefix="all-" mergedependentmodules="false"> </nbmerge> <touch file="${netbeans.dest.dir}/${one.cluster.name}.built"/> @@ -506,7 +506,7 @@ Hg ID: ${hg.id} <property name="netbeans.dest.dir" value="${netbeans.dest.dir}"/> </subant> </target> - + <target name="build-zip-ml" depends="bootstrap,set-buildnumber,check-locales-set,build-nozip-ml" description="Create a compleate multilanguage build including a ZIP distributions"> <fail message="Property locales must be set to reasonable value" unless="locales.is.set"/> @@ -516,7 +516,7 @@ Hg ID: ${hg.id} <property name="buildnum" value="dev-${buildnumber}"/> <repeat target="pack-one-cluster-ml" name="one.cluster.name.ml" values="${nb.clusters.list}"/> </target> - + <target name="pack-one-cluster-ml" if="one.cluster.name.ml"> <resolve name="one.cluster.dir.ml.pre" value="${one.cluster.name.ml}.dir"/> <pathconvert property="one.cluster.dir.ml" setonempty="false"> @@ -544,7 +544,7 @@ Hg ID: ${hg.id} <zipfileset dir="${netbeans.dest.dir}/${one.cluster.dir.ml.pre}" prefix="${netbeans.dest}"> <include name="**/locale/*_${one.locale}.*"/> </zipfileset> - </zip> + </zip> </target> <target name="check-locales-set"> @@ -622,13 +622,13 @@ Hg ID: ${hg.id} </and> </condition> </target> - + <target name="-unpack-cluster-ml-zipfile" unless="is.kit"> <unzip dest="${netbeans.dest.dir.ml}" src="${nb.build.dir}/ml/NetBeans-${cluster.package.dir}-${buildnum}.zip"> <mapper type="glob" from="netbeans/*" to="${one.cluster.dir.ml}/*"/> </unzip> </target> - + <target name="-create-cluster-ml-nbm-metadata" unless="is.kit"> <echo file="${nb.build.dir}/ml/nbms/tmp/manifest.mf">OpenIDE-Module: ${code.name} OpenIDE-Module-Localizing-Bundle: ${code.name.base.slashes}/Bundle.properties @@ -641,7 +641,7 @@ OpenIDE-Module-Short-Description=NetBeans 6.0 ${one.cluster.dir.ml} cluster loca OpenIDE-Module-Long-Description=Delivers ${locales} localization for all modules in ${one.cluster.dir.ml} cluster of NetBeans 6.0 </echo> </target> - + <target name="-create-kit-ml-nbm-metadata" if="is.kit"> <echo file="${nb.build.dir}/ml/nbms/tmp/manifest.mf">OpenIDE-Module: ${code.name} OpenIDE-Module-Localizing-Bundle: ${code.name.base.slashes}/Bundle.properties @@ -725,8 +725,8 @@ OpenIDE-Module-Long-Description=Delivers ${locales} localization of whole NetBea <property name="module.jar" value="modules/${code.name.base.dashes}.jar"/> <mkdir dir="${cluster}/modules"/> <jarwithmoduleattributes jarfile="${cluster}/${module.jar}" - compress="${build.package.compress}" - index="${build.package.index}" + compress="${build.package.compress}" + index="${build.package.index}" manifest="${nb.build.dir}/ml/nbms/tmp/manifest.mf"> <fileset dir="${nb.build.dir}/ml/nbms/classes"/> </jarwithmoduleattributes> @@ -797,16 +797,16 @@ OpenIDE-Module-Long-Description=Delivers ${locales} localization of whole NetBea <target name="create-rpms-proto"> <mkdir dir="${nb.build.dir}/rpms"/> - <repeat target="create-one-rpm-proto" name="one.cluster.name" values="${clusters.list}" /> + <repeat target="create-one-rpm-proto" name="one.cluster.name" values="${clusters.list}" /> </target> - + <target name="create-one-rpm-proto"> <taskdef name="setcluster" classname="org.netbeans.nbbuild.SetCluster" classpath="${nbantext.jar}"/> <loadproperties srcFile="cluster.properties" /> <loadproperties srcFile="cluster-description.properties" /> <setcluster cluster="${one.cluster.name}" name="one.cluster.dir" /> <mkdir dir="${nb.build.dir}/rpms"/> - + <resolve name="pkg.name" value="${one.cluster.name}.pkg.name"/> <resolve name="pkg.version" value="${one.cluster.name}.pkg.version"/> <resolve name="pkg.desc" value="${one.cluster.name}.pkg.desc"/> @@ -819,7 +819,7 @@ OpenIDE-Module-Long-Description=Delivers ${locales} localization of whole NetBea <resolve name="pkg.rpm.copyright" value="${one.cluster.name}.pkg.rpm.copyright"/> <resolve name="pkg.rpm.map" value="${one.cluster.name}.pkg.rpm.map"/> <resolve name="pkg.rpm.prefix" value="${one.cluster.name}.pkg.rpm.prefix"/> - + <echo file="${nb.build.dir}/rpms/${pkg.rpm.name}.spec"> %define global_product_version ${pkg.version} %define global_product_release 00 @@ -834,7 +834,7 @@ Prefix: %_prefix AutoReqProv: no Name: ${pkg.rpm.name} Summary: ${pkg.name} -%description +%description ${pkg.desc} %files @@ -848,7 +848,7 @@ ${pkg.rpm.map}/${one.cluster.dir}</echo> <target name="create-svr4s-proto"> <mkdir dir="${nb.build.dir}/rpms"/> - <repeat target="create-one-svr4-proto" name="one.cluster.name" values="${clusters.list}" /> + <repeat target="create-one-svr4-proto" name="one.cluster.name" values="${clusters.list}" /> </target> <target name="create-one-svr4-proto"> @@ -857,7 +857,7 @@ ${pkg.rpm.map}/${one.cluster.dir}</echo> <loadproperties srcFile="cluster-description.properties" /> <setcluster cluster="${one.cluster.name}" name="one.cluster.dir" /> <mkdir dir="${nb.build.dir}/svr4s"/> - + <resolve name="pkg.name" value="${one.cluster.name}.pkg.name"/> <resolve name="pkg.version" value="${one.cluster.name}.pkg.version"/> <resolve name="pkg.desc" value="${one.cluster.name}.pkg.desc"/> @@ -887,7 +887,7 @@ CLASSES=${pkg.svr4.classes} BASEDIR=${pkg.svr4.basedir} PKGINST=${pkg.svr4.pkginst}</echo> </target> - + <target name="-testuserdir-delete-init" depends="-load-build-properties"> <property name="test.user.dir.lock" location="${test.user.dir}/lock"/> <available property="app.running" file="${test.user.dir.lock}"/> @@ -913,7 +913,7 @@ PKGINST=${pkg.svr4.pkginst}</echo> <property name="debug.server" value="y" /> <property name="tryme.debug.args" value="-J-agentlib:jdwp=transport=dt_socket,suspend=${debug.pause},server=${debug.server},address=${debug.port}" /> </target> - + <target name="tryme-debug" depends="-jdk-presetdef-nbjpdastart" description="Start IDE in debugger. May only be called from within IDE."> <echo>Searching for JARs in ${netbeans.dest.dir}, this may take a moment...</echo> <nbjpdastart name="NetBeans" addressproperty="debug.port" transport="dt_socket"> @@ -935,15 +935,15 @@ PKGINST=${pkg.svr4.pkginst}</echo> </or> </condition> </target> - + <target name="-tryme-profile-pre72" depends="-jdk-presetdef-nbprofiledirect" if="profiler.info.jvmargs.agent" description="Start IDE in profiler (pre72 compatibility mode). May only be called from within IDE."> <property name="profiler.roots.path" value="profiler.roots.all" /> <fileset id="profiler.roots.all" dir="${netbeans.dest.dir}"> <include name="**/*.jar"/> </fileset> - <nbprofiledirect - jvmargsprefix="-J" - jvmargsproperty="profiler.jvmargs" + <nbprofiledirect + jvmargsprefix="-J" + jvmargsproperty="profiler.jvmargs" mainclass="org.netbeans.Main" > <classpath> @@ -956,16 +956,16 @@ PKGINST=${pkg.svr4.pkginst}</echo> </rootspath> </nbprofiledirect> </target> - + <target name="tryme-profile" depends="-profile-check,-tryme-profile-pre72" if="profiler.configured" unless="profiler.info.jvmargs.agent" description="Start IDE in profiler. May only be called from within IDE."> <startprofiler/> <property name="tryme.debug.args" value="-J-Dorg.osgi.framework.bootdelegation=org.netbeans.lib.profiler,org.netbeans.lib.profiler.*" /> <antcall target="tryme"/> </target> - + <target name="tryme" depends="-load-build-properties,tryme-setup-debug-args,-jdk-init" description="Try running the IDE interactively. -It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in debug mode" +It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in debug mode" > <script language="javascript"> v = '' @@ -984,12 +984,12 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <condition property="run.env.display" value="${env.NBDISPLAY}" else="${env.DISPLAY}"> <isset property="env.NBDISPLAY"/> </condition> - + <!-- architecture of jvm on which app will run --> <condition property="jvm.arch.string" value="64" else=""> <available file="${nbjdk.home}\jre\lib\amd64" /> - </condition> - + </condition> + <property name="run.args.ide" value=""/> <exec osfamily="windows" executable="${netbeans.dest.dir}/bin/netbeans${jvm.arch.string}.exe" failonerror="yes" dir="${java.io.tmpdir}"> <arg value="--jdkhome"/> @@ -1035,10 +1035,10 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d </fileset> </move> </target> - + <target name="all-l10n-kits" depends="l10n-kit"> </target> - + <target name="l10n-kit" depends="bootstrap,set-buildnumber,init-tasks" description="Builds the L10N kit"> <taskdef name="l10n" classname="org.netbeans.nbbuild.L10nTask" classpath="${nbantext.jar}"/> @@ -1047,7 +1047,7 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <property name="locales" value=""/> <l10n nbmsdir="${nbms.location}" tmpdir="tmp" patternsFile="l10n.patterns" kitFile="${l10n.kit}" locales="${locales}"/> </target> - + <target name="hg-l10n-kit"> <property name="l10n.kit" location="${nb.build.dir}/l10n.zip"/> <zip destfile="${l10n.kit}"> @@ -1069,8 +1069,8 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <target name="-cleanall" depends="init-module-list,init-tasks"> <taskdef name="cleanall" classname="org.netbeans.nbbuild.CleanAll" classpath="${nbantext.jar}"/> - <cleanall topdir=".." - modules="${allmodules}" + <cleanall topdir=".." + modules="${allmodules}" targetname="clean" resolvedependencies="${resolve.clean.dependencies}" deptargetprefix="all-" @@ -1305,7 +1305,7 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <arg value="-rf"/> <arg value="${solpkg-proto-file}"/> </exec> - <exec executable="${solpkg-pkgproto}" output="${solpkg-proto-file}" + <exec executable="${solpkg-pkgproto}" output="${solpkg-proto-file}" failonerror="yes"> <arg value="${solpkg-actual-dir}=${solpkg-pkg-dir}"/> </exec> @@ -1334,7 +1334,7 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <target name="all-russian" depends="set-russian-locale,all"/> <target name="all-french" depends="set-french-locale,all"/> <target name="all-ja-zh" depends="set-ja-zh_CN-locales,all"/> - + <target name="set-ja-zh_CN-locales"> <property name="locales" value="ja,zh_CN"/> <property name="locjar.locales" value="${locales}"/> @@ -1342,7 +1342,7 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <property name="locjhindexer.locales" value="${locales}"/> <property name="localized.build.locales" value="${locales}"/> </target> - + <target name="set-dutch-locale"> <property name="locales" value="nl"/> <property name="locjar.locales" value="${locales}"/> @@ -1366,7 +1366,7 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <property name="locjhindexer.locales" value="${locales}"/> <property name="localized.build.locales" value="${locales}"/> </target> - + <!-- end of localized builds --> @@ -1386,15 +1386,15 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d </and> </condition> </target> - - <target - name="commit-validation" - depends="commitValidation,no-commit-validation" + + <target + name="commit-validation" + depends="commitValidation,no-commit-validation" description="Runs tests to validate IDE before commit." /> <target name="all-commitValidation" description="dummy target for build error recognition facility"/> - + <!-- keep this target name at least for a while for backward compat -jglick --> <target name="commitValidation" depends="all-commitValidation,check-commit-validation" if="run.validation"> <property name="build.test.results.dir" location="${nb.build.dir}/test/commit-validation/results"/> @@ -1406,7 +1406,7 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <resolvelist list="${nb.clusters.list}" name="nb.clusters.validation.list"> <mapper type="regexp" from="(.*)" to="validation.\1"/> </resolvelist> - + <subant target="${test.type}" > <property name="test.config" value="commit"/> <property name="continue.after.failing.tests" value="true"/> @@ -1416,7 +1416,7 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <property name="test-qa-functional-sys-prop.ignore.random.failures" value="true"/> <dirset dir=".." includes="${nb.clusters.validation.list}"/> </subant> - + <pathconvert property="failed.tests" pathsep="${line.separator}"> <fileset dir="${build.test.results.dir}"> <include name="TEST-*.xml"/> @@ -1477,7 +1477,7 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <echo message="Packaging sources of ${cluster.config} modules"/> <resolve name="harness-modules" value="nb.cluster.harness"/> - + <mkdir dir="${nb.build.dir}"/> <dirset id="source.dirset" dir="${nb_all}" includes="${allmodules},${harness-modules},nbbuild,ide,nbi,libs.antlr3.devel,libs.junit4" @@ -1508,9 +1508,9 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d </target> <target name="generate-golden-files" depends="generate-golden-files-init" description="Generate summaries of module dependencies."> <property name="deps.max.friends" value="20"/> - + <taskdef name="deps" classname="org.netbeans.nbbuild.ModuleDependencies" classpath="${nbantext.jar}"/> - + <deps> <inputpattern dir="${netbeans.dest.dir}"/> <output type="group-dependencies" file="${generated.files.dir}/cluster-deps.txt" /> @@ -1532,11 +1532,11 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <taskdef name="test-deps" classname="org.netbeans.nbbuild.ModuleTestDependencies" classpath="${nbantext.jar}"/> <test-deps output="${generated.files.dir}/test-deps.txt" reverseOutput="${generated.files.dir}/reverse-test-deps.txt"/> </target> - + <target name="generate-files-layout" depends="generate-golden-files-init" description="Generate summary of installed files."> <taskdef name="generate-files-layout" classname="org.netbeans.nbbuild.GenerateFilesLayout" classpath="${nbantext.jar}"/> <property name="check.files.layout.generated" location="${generated.files.dir}/files-layout.txt" /> - + <property name="check-file-layout-root" location="${netbeans.dest.dir}" /> <generate-files-layout output="${check.files.layout.generated}"> <files dir="${check-file-layout-root}" casesensitive="yes" > @@ -1587,7 +1587,7 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <fileset dir="${nbroot}" includesfile="${listfile}"/> </apply> </target> - + <target name="increment-spec-versions" depends="bootstrap,init-module-list" description="Increment all standard module specification versions. Pass -Dbranch=true if not on the trunk."> <property name="branch" value="false"/> <taskdef name="incrspecvers" classname="org.netbeans.nbbuild.IncrementSpecificationVersions" classpath="${nbantext.jar}"/> @@ -1615,7 +1615,7 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d </fileset> </jar> <zip basedir="${test.dist.dir}" destfile="${nb.build.dir}/testdist.zip"/> - </target> + </target> <target name="gen-sigtests" depends="init-module-list" description="Generates snaphost of API of all modules" @@ -1623,7 +1623,7 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <echo message="Generating signature files for ${cluster.config} modules"/> <property name="sigtest.basedir" location="${nb.build.dir}/sigtest/snapshot"/> <property name="sigtest.output.dir" location="${nb.build.dir}/sigtest/generate"/> - + <subant target="gen-sigtest" buildpath="${modules.fullpath}" failonerror="false"> <property name="sigtest.basedir" value="${sigtest.basedir}"/> <property name="sigtest.output.dir" location="${sigtest.output.dir}"/> @@ -1641,15 +1641,15 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d </path> <mapper type="identity" /> </pathconvert> - + <subant target="gen-sigtest" buildpath="${modules.fullpath}"/> </target> - + <target name="check-sigtests-release" depends="bootstrap" description="Checks signature files of stable API modules" > <echo message="Checking signature files of stable API modules"/> - + <property name="sigtest.output.dir" location="${nb.build.dir}/sigtest/check-release"/> <property name="fail.on.error" value="true"/> <delete dir="${sigtest.output.dir}"/> @@ -1683,17 +1683,17 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <target name="check-sigtests-version"> <echo message="Checking version of signature files for ${cluster.config} modules"/> - + <property name="sigtest.previous.url" value="http://deadlock.netbeans.org/job/nbms-and-javadoc/lastStableBuild/artifact/nbbuild/build/sigtest/snapshot/*zip*/snapshot.zip"/> <property name="sigtest.prev.dir" location="${nb.build.dir}/sigtest/prev-snapshot"/> <property name="sigtest.output.dir" location="${nb.build.dir}/sigtest/versioncheck"/> - <mkdir dir="${sigtest.prev.dir}"/> + <mkdir dir="${sigtest.prev.dir}"/> <get src="${sigtest.previous.url}" dest="${sigtest.prev.dir}/snapshot.zip"/> <unzip src="${sigtest.prev.dir}/snapshot.zip" dest="${sigtest.prev.dir}"> <mapper type="flatten"/> </unzip> - + <antcall target="-do-check-sigtests"> <param name="sigtest.check.type" value="versioncheck"/> <param name="sigtest.basedir" location="${sigtest.prev.dir}"/> @@ -1707,14 +1707,14 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d </junitreport> <echo message="Report generated to ${sigtest.output.dir}/html/index.html"/> </target> - + <target name="-do-check-sigtests" depends="init-module-list"> <fail unless="sigtest.check.type"/> <fail unless="sigtest.output.dir"/> <property name="sigtest.basedir" location="${nb.build.dir}/sigtest/snapshot"/> <property name="sigtest.fail.on.error" value="false"/> - + <mkdir dir="${sigtest.basedir}"/> <delete dir="${sigtest.output.dir}"/> <mkdir dir="${sigtest.output.dir}"/> @@ -1738,7 +1738,7 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d </subant> </target> - + <target name="generate-uc-catalog" depends="bootstrap"> <taskdef name="makeupdatedesc" classname="org.netbeans.nbbuild.MakeUpdateDesc" @@ -1946,61 +1946,168 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <pathelement location="external/apache-rat-0.12.jar"/> </classpath> </taskdef> + <patternset id="non.rat"> + <exclude name="*/build/**" /> + <exclude name="nbbuild/netbeans/**" /> + <exclude name="**/*.mf" /> <!--do not nativelly support comments--> + <exclude name="**/nbproject/*.sig" /> <!--generated signatures for past versions--> + <exclude name="**/nbproject/build-impl.xml" /> <!--generated, no degree of creativity --> + <exclude name="**/nbproject/jfx-impl.xml" /> <!--generated, no degree of creativity --> + <exclude name="**/nbproject/genfiles.properties" /> <!--generated, no degree of creativity --> + <exclude name="**/nbproject/private/**" /> <!--user-specific files --> + <exclude name="**/external/*-license.txt" /> <!--licenses for external dependencies--> + <exclude name="**/external/*-notice.txt" /> <!--notices for external dependencies--> + <exclude name="**/*.pass" /> <!--generated test files--> + <exclude name="**/*.pass2" /> <!--generated test files--> + <exclude name="**/*.ref" /> <!--would cause tests to fail--> + <exclude name="**/*.palette_item" /> <!--no degree of creativity--> + <exclude name="**/src/META-INF/**" /> <!--no degree of creativity--> + <exclude name="form/test/unit/data/goldenfiles/*" /> <!--test data--> + <exclude name="diff/test/unit/data/**" /> <!--test data--> + <exclude name="diff/test/unit/src/org/netbeans/modules/diff/builtin/provider/*.txt" /> <!--test data--> + <exclude name="diff/test/unit/src/org/netbeans/modules/diff/builtin/visualizer/data/**" /> <!--test data--> + <exclude name="javadoc/test/unit/data/docs_jdk14_ja/api/index-files/**" /> <!--test data--> + <exclude name="javafx2.project/src/org/netbeans/modules/javafx2/project/templates/**" /> <!--license would be visible when users edit the templates inside their IDE--> + <exclude name="utilities/test/unit/src/org/netbeans/modules/openfile/resources/recent_files/*" /> <!--test data--> + <exclude name="**/*.url" /> <!--no degree of creativity--> + <exclude name="spi.navigator/test/unit/src/org/netbeans/modules/navigator/resources/lastsel/file.lastsel_mime1" /> <!--empty file--> + <exclude name="xml/test/unit/src/org/netbeans/modules/xml/resources/*" /> <!-- test data --> + <exclude name="xml/src/org/netbeans/modules/xml/resources/templates/*" /> <!-- template files - tracked by https://issues.apache.org/jira/browse/NETBEANS-85 --> + <exclude name="xml.axi/test/unit/src/org/netbeans/modules/xml/axi/resources/**" /> <!-- test data --> + <exclude name="xml.schema.completion/test/unit/src/org/netbeans/modules/xml/schema/completion/resources/**" /> <!-- test data --> + <exclude name="xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/**/*.wsdl" /> <!-- test data --> + <exclude name="xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/**/*.xml" /> <!-- test data --> + <exclude name="xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/**/*.xsd" /> <!-- test data --> + <exclude name="xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/**/*.bpel" /> <!-- test data --> + <exclude name="xml.lexer/test/unit/src/org/netbeans/api/xml/lexer/resources/*.dtd" /> <!-- test data --> + <exclude name="xml.lexer/test/unit/src/org/netbeans/api/xml/lexer/resources/*.xml" /> <!-- test data --> + <exclude name="xml.tools/test/qa-functional/src/org/netbeans/modules/**/*.xml" /> <!-- test data --> + <exclude name="xml.tools/test/qa-functional/src/org/netbeans/modules/**/*.dtd" /> <!-- test data --> + <exclude name="xml.tools/test/qa-functional/src/org/netbeans/modules/**/*.txt" /> <!-- test data --> + <exclude name="xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/**/*.xsd" /> <!-- test data --> + <exclude name="xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/resources/*.xml" /> <!-- test data --> + <exclude name="xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/resources/*.zip" /> <!-- test data --> + <exclude name="xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/resources/dummyProject/nbproject/private/tmpfile" /> <!-- test data --> + <exclude name="xml.wsdl.model/test/unit/src/org/netbeans/modules/xml/wsdl/**/*.wsdl" /> <!-- test data --> + <exclude name="xml.wsdl.model/test/unit/src/org/netbeans/modules/xml/wsdl/**/*.xsd" /> <!-- test data --> + <exclude name="xml.wsdl.model/test/unit/src/org/netbeans/modules/xml/wsdl/**/*.xml" /> <!-- test data --> + <exclude name="xml.text/src/org/netbeans/modules/xml/text/resources/DTDExample" /> <!-- GUI sample file to demonstrate syntax highlighting --> + <exclude name="xml.text/src/org/netbeans/modules/xml/text/resources/XMLExample" /> <!-- GUI sample file to demonstrate syntax highlighting --> + <exclude name="xml.text/test/qa-functional/src/org/netbeans/modules/xml/text/**/data/**" /> <!-- test data --> + <exclude name="xsl/src/org/netbeans/modules/xsl/resources/templates/stylesheet.xsl" /> <!-- Template for user - very limited degree of creativity --> + <exclude name="xsl/test/unit/src/org/netbeans/modules/xsl/utils/data/*" /> <!--test data--> + <exclude name="spi.navigator/test/unit/src/org/netbeans/modules/navigator/resources/lastsel/file.lastsel_mime1" /> <!--empty file--> + <exclude name="templates/src/org/netbeans/modules/templates/resources/userprop.txt" /> <!--no degree of creativity--> + <exclude name="api.search/test/unit/data/textFiles/utf8file.txt" /> <!--test data--> + <exclude name="api.search/test/unit/src/org/netbeans/modules/search/data/**" /> <!--test data--> + <exclude name="beans/src/org/netbeans/modules/beans/resources/templates/*.template" /> <!--license would be visible when users edit the templates inside their IDE--> + <exclude name="css.lib/test/unit/data/**" /> <!--test data--> + <exclude name="extbrowser/test/unit/src/org/netbeans/modules/extbrowser/data/mac_defaults_*" /> <!--test data--> + <exclude name="spring.beans/src/org/netbeans/modules/spring/beans/resources/templates/*.template" /> <!--license would be visible when users edit the templates inside their IDE--> + <exclude name="debugger.jpda/test/unit/src/org/netbeans/api/debugger/jpda/testapps/JspLineBreakpointApp.txt" /> <!-- test data --> + <exclude name="editor.settings.storage/test/unit/src/org/netbeans/modules/editor/settings/storage/compatibility/p1/**" /> <!--test data--> + <exclude name="editor.plain/src/org/netbeans/modules/editor/plain/resources/PlainTextExample" /> <!--license would be visible to users in the Fonts/Colors settings--> + <exclude name="editor.fold/test/unit/data/goldenfiles/hierarchy/update-hierarchy.folds" /> <!--test data--> + <exclude name="editor.fold/test/unit/data/hierarchy/update-hierarchy.folds" /> <!--test data--> + <exclude name="editor.fold/test/unit/src/org/netbeans/modules/editor/fold/FoldContentReader.txt" /> <!--test data--> + <exclude name="libs.freemarker/test/unit/data/**" /> <!--test data--> + <exclude name="languages.yaml/src/org/netbeans/modules/languages/yaml/*.yml" /> <!--Files used in GUI as sample/starting point--> + <exclude name="languages.yaml/src/org/netbeans/modules/languages/yaml/*.yaml" /> <!--Files used in GUI as sample/starting point--> + <exclude name="languages.yaml/test/unit/data/testfiles/*" /> <!--test data--> + <exclude name="versioning.core/test/unit/data/workdir/root/a.txt" /> <!--test data--> + <exclude name="versioning.core/test/unit/data/workdir/root-test-versioned/**" /> <!--test data--> + <exclude name="versioning.core/test/unit/data/workdir/root-with-exclusions/**" /> <!--test data--> + <exclude name="websvc.saas.kit/release/VERSION.txt" /> <!--generated file--> + <exclude name="versioning/test/unit/data/workdir/root/a.txt" /> <!--test data--> + <exclude name="versioning/test/unit/data/workdir/root-test-versioned/**" /> <!--test data--> + <exclude name="versioning/test/unit/data/workdir/root-with-exclusions/**" /> <!--test data--> + <exclude name="testng.ui/src/org/netbeans/modules/testng/ui/resources/*.template" /> <!--template files--> + <exclude name="languages.diff/src/org/netbeans/modules/languages/diff/DiffExample.diff" /> <!--license would be visible to users in the Fonts/Colors settings--> + <exclude name="versioning.util/test/unit/data/historycache/*" /> <!--test data--> + <exclude name="java.lexer/test/unit/data/testfiles/*" /> <!--test data--> + <exclude name="spellchecker.dictionary_en/release/modules/dict/*.description" /> <!--Description Files--> + <exclude name="selenium2.java/src/org/netbeans/modules/selenium2/java/SeleneseIT.java.template" /> <!--template file--> + <exclude name="projectuiapi/test/unit/data/*.txt" /> <!--test data--> + <exclude name="projectuiapi/test/unit/src/org/netbeans/modules/project/uiapi/data/*.txt" /> <!--test data--> + <exclude name="projectui/src/org/netbeans/modules/project/ui/resources/*-license.txt" /> <!--licenses--> + <exclude name="projectui/src/org/netbeans/modules/project/ui/resources/license-default.txt" /> <!--licenses--> + <exclude name="hudson.subversion/test/unit/src/org/netbeans/modules/hudson/subversion/sample-entries-file" /> <!--test data--> + <exclude name="java.editor/src/org/netbeans/modules/java/editor/resources/JavaExample" /> <!--no degree of creativity--> + <exclude name="java.editor/test/qa-functional/data/**" /> <!--test data--> + <exclude name="java.editor/test/unit/data/**" /> <!--test data--> + <exclude name="java.editor.base/test/unit/data/**" /> <!--test data--> + <exclude name="ide.kit/test/qa-functional/**/*.txt" /> <!-- test data --> + <exclude name="mercurial/src/org/netbeans/modules/mercurial/util/log*" /> <!-- user templates for mercurial commits, etc. --> + <exclude name="mercurial/test/qa-functional/data/files/**"/> <!-- qa test data --> + <exclude name="mercurial/test/unit/data/**" /> <!-- unit test data --> + <exclude name="css.prep/test/qa-functional/data/css_prep/public_html/**" /> <!--simple files for testing--> + <exclude name="css.prep/test/unit/data/testFiles/test.less" /> <!--simple file forss testing--> + <exclude name="css.prep/test/unit/data/testFiles/testIssue227676.scss" /> <!--simple file for testing--> + <exclude name="css.prep/test/unit/data/testProject/public_html/*" /> <!--simple files for testing--> + <exclude name="junit.ui/src/org/netbeans/modules/junit/ui/resources/*.template" /> <!--license would be visible when users edit the templates inside their IDE--> + <exclude name="java.api.common/src/org/netbeans/modules/java/api/common/project/ui/customizer/vmo/gen/CommandLine.tokens" /> <!--generated by ANTLR--> + <exclude name="javafx2.editor/test/unit/data/org/netbeans/modules/javafx2/editor/**/*.fxml" /> + <exclude name="javafx2.editor/test/unit/data/goldenfiles/org/netbeans/modules/javafx2/editor/completion/impl/**/*.out*" /> + <exclude name="javawebstart/AntTasks/build/**" /> <!-- generated build files --> + <exclude name="projectimport.eclipse.core/test/unit/data/**" /> <!--test data--> + <exclude name="html.lexer/test/unit/data/testfiles/*" /> <!--test data--> + <exclude name="o.apache.tools.ant.module/release/VERSION.txt" /> <!--generated file--> + <exclude name="o.apache.tools.ant.module/test/unit/data/**/*.xml" /> <!--test data--> + <exclude name="o.apache.tools.ant.module/test/unit/data/**/*.properties" /> <!--test data--> + <exclude name="o.apache.tools.ant.module/src/org/apache/tools/ant/module/resources/CustomTask_java" /> <!-- user visible file template --> + <exclude name="o.apache.tools.ant.module/src/org/apache/tools/ant/module/resources/Project.xml_" /> <!-- user visible file template --> + <exclude name="javafx2.kit/release/VERSION.txt" /> <!--generated file--> + <exclude name="options.editor/src/org/netbeans/modules/options/colors/AllLanguagesExample" /> <!--no degree of creativitya--> + <exclude name="options.editor/src/org/netbeans/modules/options/colors/HighlightingExample" /> <!--no degree of creativitya--> + <exclude name="options.editor/src/org/netbeans/modules/options/indentation/indentationExample" /> <!--no degree of creativitya--> + <exclude name="hibernate/src/org/netbeans/modules/hibernate/resources/Hibernate*.xml" /> <!--template files--> + <exclude name="hibernate/src/org/netbeans/modules/hibernate/resources/HibernateUtil.javax" /> <!--template file--> + <exclude name="java.j2semodule/src/org/netbeans/modules/java/j2semodule/ui/resources/module-info.java.template" /> <!--template file--> + <exclude name="j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/resources/*.xsd" /> <!-- XSDs for usage at runtime and code generation - the XSDs are not modified, so covered by https://www.apache.org/legal/resolved.html#category-b --> + <exclude name="j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/ui/resources/*.xml" /> <!-- user visible file template --> + <exclude name="j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/jpacontroller/resources/*.txt" /> <!-- user visible file template --> + </patternset> <rat:report xmlns:rat="antlib:org.apache.rat.anttasks" reportfile="build/rat-report.txt"> - <fileset dir="${nb_all}"> - <exclude name="*/build/**" /> - <exclude name="nbbuild/netbeans/**" /> - <exclude name="**/*.mf" /> <!--do not nativelly support comments--> - <exclude name="*/nbproject/*.sig" /> <!--generated signatures for past versions--> - <exclude name="*/nbproject/build-impl.xml" /> <!--generated, no degree of creativity --> - <exclude name="*/nbproject/jfx-impl.xml" /> <!--generated, no degree of creativity --> - <exclude name="*/nbproject/genfiles.properties" /> <!--generated, no degree of creativity --> - <exclude name="*/nbproject/private/**" /> <!--user-specific files --> - <exclude name="*/external/*-license.txt" /> <!--licenses for external dependencies--> - <exclude name="*/external/*-notice.txt" /> <!--notices for external dependencies--> - <exclude name="**/*.pass" /> <!--generated test files--> - <exclude name="**/*.pass2" /> <!--generated test files--> - <exclude name="**/*.ref" /> <!--would cause tests to fail--> - <exclude name="**/.list" /> <!--no degree of creativity--> - <exclude name="**/src/META-INF/**" /> <!--no degree of creativity--> - <exclude name="form/test/unit/data/goldenfiles/*" /> <!--test data--> - <exclude name="diff/test/unit/data/**" /> <!--test data--> - <exclude name="diff/test/unit/src/org/netbeans/modules/diff/builtin/provider/*.txt" /> <!--test data--> - <exclude name="diff/test/unit/src/org/netbeans/modules/diff/builtin/visualizer/data/**" /> <!--test data--> - <exclude name="javadoc/test/unit/data/docs_jdk14_ja/api/index-files/**" /> <!--test data--> - <exclude name="javafx2.project/src/org/netbeans/modules/javafx2/project/templates/**" /> <!--license would be visible when users edit the templates inside their IDE--> - <exclude name="utilities/test/unit/src/org/netbeans/modules/openfile/resources/recent_files/*" /> <!--test data--> - <exclude name="**/*.url" /> <!--no degree of creativity--> - <exclude name="spi.navigator/test/unit/src/org/netbeans/modules/navigator/resources/lastsel/file.lastsel_mime1" /> <!--empty file--> - <exclude name="templates/src/org/netbeans/modules/templates/resources/userprop.txt" /> <!--no degree of creativity--> - <exclude name="api.search/test/unit/data/textFiles/utf8file.txt" /> <!--test data--> - <exclude name="api.search/test/unit/src/org/netbeans/modules/search/data/**" /> <!--test data--> - <exclude name="beans/src/org/netbeans/modules/beans/resources/templates/*.template" /> <!--license would be visible when users edit the templates inside their IDE--> - <exclude name="extbrowser/test/unit/src/org/netbeans/modules/extbrowser/data/mac_defaults_*" /> <!--test data--> - <exclude name="spring.beans/src/org/netbeans/modules/spring/beans/resources/templates/*.template" /> <!--license would be visible when users edit the templates inside their IDE--> - <exclude name="editor.settings.storage/test/unit/src/org/netbeans/modules/editor/settings/storage/compatibility/p1/**" /> <!--test data--> - <exclude name="editor.plain/src/org/netbeans/modules/editor/plain/resources/PlainTextExample" /> <!--license would be visible to users in the Fonts/Colors settings--> - <exclude name="editor.fold/test/unit/data/goldenfiles/hierarchy/update-hierarchy.folds" /> <!--test data--> - <exclude name="editor.fold/test/unit/data/hierarchy/update-hierarchy.folds" /> <!--test data--> - <exclude name="editor.fold/test/unit/src/org/netbeans/modules/editor/fold/FoldContentReader.txt" /> <!--test data--> - <exclude name="libs.freemarker/test/unit/data/**" /> <!--test data--> - <exclude name="languages.yaml/src/org/netbeans/modules/languages/yaml/*.yml" /> <!--Files used in GUI as sample/starting point--> - <exclude name="languages.yaml/src/org/netbeans/modules/languages/yaml/*.yaml" /> <!--Files used in GUI as sample/starting point--> - <exclude name="languages.yaml/test/unit/data/testfiles/*" /> <!--test data--> - <exclude name="versioning.core/test/unit/data/workdir/root/a.txt" /> <!--test data--> - <exclude name="versioning.core/test/unit/data/workdir/root-test-versioned/**" /> <!--test data--> - <exclude name="versioning.core/test/unit/data/workdir/root-with-exclusions/**" /> <!--test data--> - <exclude name="websvc.saas.kit/release/VERSION.txt" /> <!--generated file--> - <exclude name="versioning/test/unit/data/workdir/root/a.txt" /> <!--test data--> - <exclude name="versioning/test/unit/data/workdir/root-test-versioned/**" /> <!--test data--> - <exclude name="versioning/test/unit/data/workdir/root-with-exclusions/**" /> <!--test data--> - <exclude name="testng.ui/src/org/netbeans/modules/testng/ui/resources/*.template" /> <!--template files--> - <exclude name="versioning.util/test/unit/data/historycache/*" /> <!--test data--> - <exclude name="java.lexer/test/unit/data/testfiles/*" /> <!--test data--> - <exclude name="projectuiapi/test/unit/data/*.txt" /> <!--test data--> - <exclude name="projectuiapi/test/unit/src/org/netbeans/modules/project/uiapi/data/*.txt" /> <!--test data--> + <rat:substringMatcher licenseFamilyCategory="w3c2" licenseFamilyName="W3C Software and Document Notice and License"> + <pattern substring="W3C Software and Document Notice and License"/> + </rat:substringMatcher> + <rat:substringMatcher licenseFamilyCategory="oasis" licenseFamilyName="OASIS"> + <pattern substring="[OASIS]"/> + </rat:substringMatcher> + <rat:fullTextMatcher licenseFamilyCategory="wsdl" licenseFamilyName="WSDL Schema Files"> + International Business Machines Corporation and Microsoft Corporation + All Rights Reserved + License for WSDL Schema Files + </rat:fullTextMatcher> + <rat:approvedLicense familyName="W3C Software and Document Notice and License"/> + <rat:approvedLicense familyName="OASIS"/> + <rat:approvedLicense familyName="WSDL Schema Files" /> + <fileset dir="${nb_all}"> + <patternset refid="non.rat" /> + </fileset> + </rat:report> + <rat:report xmlns:rat="antlib:org.apache.rat.anttasks" format="xml" reportfile="build/rat-report.xml"> + <rat:substringMatcher licenseFamilyCategory="w3c2" licenseFamilyName="W3C Software and Document Notice and License"> + <pattern substring="W3C Software and Document Notice and License"/> + </rat:substringMatcher> + <rat:substringMatcher licenseFamilyCategory="oasis" licenseFamilyName="OASIS"> + <pattern substring="[OASIS]"/> + </rat:substringMatcher> + <rat:fullTextMatcher licenseFamilyCategory="wsdl" licenseFamilyName="WSDL Schema Files"> + International Business Machines Corporation and Microsoft Corporation + All Rights Reserved + License for WSDL Schema Files + </rat:fullTextMatcher> + <rat:approvedLicense familyName="W3C Software and Document Notice and License"/> + <rat:approvedLicense familyName="OASIS"/> + <rat:approvedLicense familyName="WSDL Schema Files" /> + <fileset dir="${nb_all}"> + <patternset refid="non.rat" /> </fileset> </rat:report> + <taskdef name="rattohtml" classname="org.netbeans.nbbuild.RatReportTask" classpath="${build.ant.classes.dir}"/> + <loadproperties srcFile="cluster.properties" /> + <rattohtml source="build/rat-report.xml" report="${nb.build.dir}/rat/"/> </target> </project> diff --git a/nbbuild/javadoctools/template.xml b/nbbuild/javadoctools/template.xml index a0d67936b..0c223cfd5 100644 --- a/nbbuild/javadoctools/template.xml +++ b/nbbuild/javadoctools/template.xml @@ -276,7 +276,7 @@ cause it to fail. </target> <target name="javadoc-exec-packages" depends="javadoc-init,javadoc-generate-references,javadoc-generate-overview,javadoc-exec-condition,javadoc-check-timestamps,javadoc-make-plain-title,javadoc-make-hyperlinked-title,javadoc-exec-condition,-javadoc-set-footer" unless="javadoc.exec.packages"> - <javadoc source="${javac.source}" author="false" destdir="${javadoc.out.dir}" packagenames="${javadoc.packages}" stylesheetfile="${javadoc.css.main}" windowtitle="${javadoc.title}" overview="${javadoc.overview}" splitindex="true" use="true" version="false" encoding="UTF-8"> + <javadoc source="${javac.source}" author="false" destdir="${javadoc.out.dir}" packagenames="${javadoc.packages}" stylesheetfile="${javadoc.css.main}" windowtitle="${javadoc.title}" overview="${javadoc.overview}" splitindex="true" use="true" version="false" useexternalfile="true" encoding="UTF-8"> <sourcepath> <pathelement location="${javadoc.docfiles}"/> <pathelement location="${javadoc.src}"/> diff --git a/nbbuild/nbproject/project.xml b/nbbuild/nbproject/project.xml index a3474954f..bcccf0792 100644 --- a/nbbuild/nbproject/project.xml +++ b/nbbuild/nbproject/project.xml @@ -202,14 +202,14 @@ <subprojects/> <project-license>cddl-netbeans-sun</project-license> </general-data> - <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/2"> + <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/4"> <compilation-unit> <package-root>antsrc</package-root> <classpath mode="compile">${ant.core.lib}:${nb_all}/javahelp/external/jhall-2.0_05.jar</classpath> <classpath mode="boot">${nbjdk.bootclasspath}</classpath> <built-to>${nb.build.dir}/antclasses</built-to> <built-to>${nbantext.jar}</built-to> - <source-level>1.5</source-level> + <source-level>1.8</source-level> </compilation-unit> <compilation-unit> <package-root>test/unit/src</package-root> @@ -217,7 +217,7 @@ <classpath mode="compile">${test.unit.cp}</classpath> <classpath mode="boot">${nbjdk.bootclasspath}</classpath> <built-to>${nb.build.dir}/test/unit/classes</built-to> - <source-level>1.5</source-level> + <source-level>1.8</source-level> </compilation-unit> </java-data> </configuration> diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/CheckLicenseAnt.xml b/nbbuild/test/unit/src/org/netbeans/nbbuild/CheckLicenseAnt.xml index 12fccabb9..b221e805e 100644 --- a/nbbuild/test/unit/src/org/netbeans/nbbuild/CheckLicenseAnt.xml +++ b/nbbuild/test/unit/src/org/netbeans/nbbuild/CheckLicenseAnt.xml @@ -10,12 +10,12 @@ <fileset dir='${dir}'> <include name="${include}" /> </fileset> - <convert token='^( *[^ ]) *DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.' replace='Ahoj\nJardo' prefix='true'/> - <convert token=' *DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.'> + <convert token='^( *[^ ]) *Licensed to the Apache Software Foundation \(ASF\) under one' replace='Ahoj\nJardo' prefix='true'/> + <convert token=' *Licensed to the Apache Software Foundation \(ASF\) under one'> <line text='Ahoj'/> <line text='Jardo'/> </convert> - <convert token=' *Oracle and Java.*are.*registered.*trademarks.*of.*Oracle.*and.*or.*its.* affiliates.' + <convert token=' *or more contributor.*license.*agreements\..*See.*the NOTICE file' > <line text='New'/> <line text='Warning'/> diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/CheckLicenseHtmlExample.xml b/nbbuild/test/unit/src/org/netbeans/nbbuild/CheckLicenseHtmlExample.xml index 55847d0eb..966c9300b 100644 --- a/nbbuild/test/unit/src/org/netbeans/nbbuild/CheckLicenseHtmlExample.xml +++ b/nbbuild/test/unit/src/org/netbeans/nbbuild/CheckLicenseHtmlExample.xml @@ -1,22 +1,20 @@ <!-- - - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. - + - Licensed to the Apache Software Foundation (ASF) under one + - or more contributor license agreements. See the NOTICE file + - distributed with this work for additional information + - regarding copyright ownership. The ASF licenses this file + - to you under the Apache License, Version 2.0 (the + - "License"); you may not use this file except in compliance + - with the License. You may obtain a copy of the License at + - + - http://www.apache.org/licenses/LICENSE-2.0 + - + - Unless required by applicable law or agreed to in writing, + - software distributed under the License is distributed on an + - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + - KIND, either express or implied. See the License for the + - specific language governing permissions and limitations + - under the License. --> <HTML><BODY> diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/CheckLicensePropertiesExample.properties b/nbbuild/test/unit/src/org/netbeans/nbbuild/CheckLicensePropertiesExample.properties index b589d9d04..b71966116 100644 --- a/nbbuild/test/unit/src/org/netbeans/nbbuild/CheckLicensePropertiesExample.properties +++ b/nbbuild/test/unit/src/org/netbeans/nbbuild/CheckLicensePropertiesExample.properties @@ -14,7 +14,6 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. - OpenIDE-Module-Name=Settings API OpenIDE-Module-Short-Description=A library for storing settings in custom formats. OpenIDE-Module-Long-Description=\ diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/CheckLicenseTest.java b/nbbuild/test/unit/src/org/netbeans/nbbuild/CheckLicenseTest.java index 72c2e6f4a..826dd5b32 100644 --- a/nbbuild/test/unit/src/org/netbeans/nbbuild/CheckLicenseTest.java +++ b/nbbuild/test/unit/src/org/netbeans/nbbuild/CheckLicenseTest.java @@ -201,31 +201,23 @@ public void testTheTaskFailsIfItIsMissing() throws Exception { public void testReplaceJavaLicense() throws Exception { java.io.File tmp = extractString( -"/*\n" + -" * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.\n" + +"/**\n" + +" * Licensed to the Apache Software Foundation (ASF) under one\n" + +" * or more contributor license agreements. See the NOTICE file\n" + +" * distributed with this work for additional information\n" + +" * regarding copyright ownership. The ASF licenses this file\n" + +" * to you under the Apache License, Version 2.0 (the\n" + +" * \"License\"); you may not use this file except in compliance\n" + +" * with the License. You may obtain a copy of the License at\n" + " *\n" + -" * Copyright 2012 Oracle and/or its affiliates. All rights reserved.\n" + +" * http://www.apache.org/licenses/LICENSE-2.0\n" + " *\n" + -" * Oracle and Java are registered trademarks of Oracle and/or its affiliates.\n" + -" * Other names may be trademarks of their respective owners.\n" + -" *\n" + -" * The contents of this file are subject to the terms of either the GNU\n" + -" * General Public License Version 2 only (\"GPL\") or the Common\n" + -" * Development and Distribution License(\"CDDL\") (collectively, the\n" + -" * \"License\"). You may not use this file except in compliance with the\n" + -" * License. You can obtain a copy of the License at\n" + -" * http://www.netbeans.org/cddl-gplv2.html\n" + -" * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the\n" + -" * specific language governing permissions and limitations under the\n" + -" * License. When distributing the software, include this License Header\n" + -" * Notice in each file and include the License file at\n" + -" * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this\n" + -" * particular file as subject to the \"Classpath\" exception as provided\n" + -" * by Oracle in the GPL Version 2 section of the License file that\n" + -" * accompanied this code. If applicable, add the following below the\n" + -" * License Header, with the fields enclosed by brackets [] replaced by\n" + -" * your own identifying information:\n" + -" * \"Portions Copyrighted [year] [name of copyright owner]\"\n" + +" * Unless required by applicable law or agreed to in writing,\n" + +" * software distributed under the License is distributed on an\n" + +" * \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n" + +" * KIND, either express or implied. See the License for the\n" + +" * specific language governing permissions and limitations\n" + +" * under the License.\n" + " */" ); File java = new File(tmp.getParentFile(), "MyTest.java"); @@ -630,15 +622,6 @@ public void testReplacePropertiesLicense() throws Exception { } } } - - { - if (content.indexOf("2002") != -1) { - fail("No reference to year 2002:\n" + content); - } - if (content.indexOf("2006") == -1) { - fail("There should be a ref to 2006:\n" + content); - } - } } private static boolean isWindows() { @@ -688,15 +671,6 @@ public void testReplaceXMLLicense() throws Exception { fail("warning shall be there:\n" + content); } } - - { - if (content.indexOf("2002") != -1) { - fail("No reference to year 2002:\n" + content); - } - if (content.indexOf("2006") == -1) { - fail("There should be a ref to 2006:\n" + content); - } - } } public void testProblemsWithTermEmulator() throws Exception { diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/CheckLicenseXmlExample.xml b/nbbuild/test/unit/src/org/netbeans/nbbuild/CheckLicenseXmlExample.xml index d75ec6073..12147d2d5 100644 --- a/nbbuild/test/unit/src/org/netbeans/nbbuild/CheckLicenseXmlExample.xml +++ b/nbbuild/test/unit/src/org/netbeans/nbbuild/CheckLicenseXmlExample.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information @@ -17,7 +16,6 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - --> <project basedir="." default="netbeans" name="javacvs/libmodule"> <import file="../../nbbuild/templates/projectized.xml"/> diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/ModuleListParserTest.java b/nbbuild/test/unit/src/org/netbeans/nbbuild/ModuleListParserTest.java index a1392eae1..e7764059d 100644 --- a/nbbuild/test/unit/src/org/netbeans/nbbuild/ModuleListParserTest.java +++ b/nbbuild/test/unit/src/org/netbeans/nbbuild/ModuleListParserTest.java @@ -236,23 +236,24 @@ public void buildFinished(BuildEvent buildEvent) {} ModuleListParser.Entry e = p.findByCodeNameBase(cnb); assertNotNull("found netigso module", e); } - - public void testScanSourcesAndBinariesForExternalStandaloneModule() throws Exception { - Hashtable<String,Object> properties = new Hashtable<String,Object>(); - properties.put("cluster.path.final", filePath(nball, "apisupport.ant/test/unit/data/example-external-projects/suite3/nbplatform/platform5") + - File.pathSeparator + filePath(nball, "apisupport.ant/test/unit/data/example-external-projects/suite3/nbplatform/random")); - properties.put("basedir", filePath(nball, "apisupport.ant/test/unit/data/example-external-projects/suite3/dummy-project")); - properties.put("project", filePath(nball, "apisupport.ant/test/unit/data/example-external-projects/suite3/dummy-project")); - ModuleListParser p = new ModuleListParser(properties, ModuleType.STANDALONE, null); - ModuleListParser.Entry e = p.findByCodeNameBase("org.netbeans.examples.modules.dummy"); - assertNotNull("found myself", e); - assertEquals("org.netbeans.examples.modules.dummy", e.getCnb()); - assertEquals(file(nball, "apisupport.ant/test/unit/data/example-external-projects/suite3/dummy-project/build/cluster/modules/org-netbeans-examples-modules-dummy.jar"), e.getJar()); - assertEquals(Collections.EMPTY_LIST, Arrays.asList(e.getClassPathExtensions())); - e = p.findByCodeNameBase("org.netbeans.modules.classfile"); - assertNotNull("found (fake) netbeans.org module by its binary", e); - assertEquals("org.netbeans.modules.classfile", e.getCnb()); - } + +// Disabled test - referenced project files were not donated to apache +// public void testScanSourcesAndBinariesForExternalStandaloneModule() throws Exception { +// Hashtable<String,Object> properties = new Hashtable<String,Object>(); +// properties.put("cluster.path.final", filePath(nball, "apisupport.ant/test/unit/data/example-external-projects/suite3/nbplatform/platform5") + +// File.pathSeparator + filePath(nball, "apisupport.ant/test/unit/data/example-external-projects/suite3/nbplatform/random")); +// properties.put("basedir", filePath(nball, "apisupport.ant/test/unit/data/example-external-projects/suite3/dummy-project")); +// properties.put("project", filePath(nball, "apisupport.ant/test/unit/data/example-external-projects/suite3/dummy-project")); +// ModuleListParser p = new ModuleListParser(properties, ModuleType.STANDALONE, null); +// ModuleListParser.Entry e = p.findByCodeNameBase("org.netbeans.examples.modules.dummy"); +// assertNotNull("found myself", e); +// assertEquals("org.netbeans.examples.modules.dummy", e.getCnb()); +// assertEquals(file(nball, "apisupport.ant/test/unit/data/example-external-projects/suite3/dummy-project/build/cluster/modules/org-netbeans-examples-modules-dummy.jar"), e.getJar()); +// assertEquals(Collections.EMPTY_LIST, Arrays.asList(e.getClassPathExtensions())); +// e = p.findByCodeNameBase("org.netbeans.modules.classfile"); +// assertNotNull("found (fake) netbeans.org module by its binary", e); +// assertEquals("org.netbeans.modules.classfile", e.getCnb()); +// } private File generateJar (File f, String[] content, Manifest manifest) throws IOException { JarOutputStream os = new JarOutputStream (new FileOutputStream (f), manifest); diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/extlibs/DownloadBinariesTest.java b/nbbuild/test/unit/src/org/netbeans/nbbuild/extlibs/DownloadBinariesTest.java index 75e9ff81e..79501ca97 100644 --- a/nbbuild/test/unit/src/org/netbeans/nbbuild/extlibs/DownloadBinariesTest.java +++ b/nbbuild/test/unit/src/org/netbeans/nbbuild/extlibs/DownloadBinariesTest.java @@ -27,6 +27,7 @@ import org.apache.tools.ant.Project; import org.apache.tools.ant.types.FileSet; import org.netbeans.junit.NbTestCase; +import org.netbeans.nbbuild.extlibs.DownloadBinaries.MavenCoordinate; public class DownloadBinariesTest extends NbTestCase { @@ -84,15 +85,15 @@ public void testUpdatingBinary() throws Exception { } public void testIsNormalDownload() { - boolean is = DownloadBinaries.isMavenFile("5C372AB96C721258C5C12BB8EAD291BBBA5DACE6", "hello"); + boolean is = MavenCoordinate.isMavenFile("hello"); assertFalse("This is hg.netbeans.org hashed file", is); } public void testIsMavenDownload() { - final String[] hashAndId = new String[] { "CEC2829EC391CB404AD32EB2D08F879C418B745B", "org.netbeans.html:xhr4j:1.3" }; - boolean is = DownloadBinaries.isMavenFile(hashAndId); + final String id = "org.netbeans.html:xhr4j:1.3"; + boolean is = MavenCoordinate.isMavenFile(id); assertTrue("Contains co-ordinates", is); - String targetName = DownloadBinaries.mavenFileName(hashAndId); + String targetName = MavenCoordinate.fromGradleFormat(id).toArtifactFilename(); assertEquals("xhr4j-1.3.jar", targetName); } diff --git a/nbi/l10n.list b/nbi/l10n.list index 547330e0d..43409db5c 100644 --- a/nbi/l10n.list +++ b/nbi/l10n.list @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# #i18n bundles for NBI installers nbi/engine/src/**/Bundle*.properties nbi/engine/src/data/engine*.properties diff --git a/nbjunit/src/org/netbeans/junit/internal/FakeMetaInf.txt b/nbjunit/src/org/netbeans/junit/internal/FakeMetaInf.txt index d5d79ca1e..25ff5fab2 100644 --- a/nbjunit/src/org/netbeans/junit/internal/FakeMetaInf.txt +++ b/nbjunit/src/org/netbeans/junit/internal/FakeMetaInf.txt @@ -1 +1,17 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + org.netbeans.junit.internal.NbModuleLogHandler diff --git a/o.apache.tools.ant.module/l10n.list b/o.apache.tools.ant.module/l10n.list index 767a226fb..f2ed692f5 100644 --- a/o.apache.tools.ant.module/l10n.list +++ b/o.apache.tools.ant.module/l10n.list @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# # ant read global ${l10n-module}/src-bridge/**/Bundle.properties diff --git a/o.apache.tools.ant.module/src/org/apache/tools/ant/module/resources/CustomTask_java b/o.apache.tools.ant.module/src/org/apache/tools/ant/module/resources/CustomTask_java index 51439603b..be23fee2f 100644 --- a/o.apache.tools.ant.module/src/org/apache/tools/ant/module/resources/CustomTask_java +++ b/o.apache.tools.ant.module/src/org/apache/tools/ant/module/resources/CustomTask_java @@ -1,42 +1,3 @@ -<#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. - -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. - -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" - -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): ---> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> <#assign licenseLast = " */"> diff --git a/o.apache.ws.commons.util/external/binaries-list b/o.apache.ws.commons.util/external/binaries-list index a51067637..5ec47d828 100644 --- a/o.apache.ws.commons.util/external/binaries-list +++ b/o.apache.ws.commons.util/external/binaries-list @@ -14,4 +14,4 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -52BEF8900248E7AB86C5743ED14A48AD787BF457 ws-commons-util-1.0.1.jar +126E80FF798FECE634BC94E61F8BE8A8DA00BE60 org.apache.ws.commons:ws-commons-util:1.0.1 diff --git a/o.apache.xml.resolver/build.xml b/o.apache.xml.resolver/build.xml index e29604107..40143e1fb 100644 --- a/o.apache.xml.resolver/build.xml +++ b/o.apache.xml.resolver/build.xml @@ -20,5 +20,43 @@ --> <project name="o.apache.xml.resolver" default="netbeans" basedir="."> + <import file="../nbbuild/templates/projectized.xml"/> + + <!-- A task to check if the binary 'external/resolver-1.2.jar exists --> + <target name="-check-requires-patching-maven-sources"> + <available file="external/resolver-1.2.jar" property="sources-already-patched" /> + </target> + + <!-- + '-javac-init' task is invoked after maven sources have been downloaded + to 'external/xml-resolver-1.2-sources.jar' + (see external/binaries-list). + Then if 'external/resolver-1.2.jar does NOT exist... + --> + <target name="-prepare-patched-binary" depends="-check-requires-patching-maven-sources" unless="sources-already-patched"> + <echo message="Patching xml-resolver-1.2-sources.jar for Netbeans..." /> + <!-- ... 1. Prepares a 'build/external-patch/[sources|classes]' working directories --> + <delete dir="build/external-patch" /> + <mkdir dir="build/external-patch/sources" /> + <!-- ... 2. Unzips maven sources --> + <unzip src="external/xml-resolver-1.2-sources.jar" dest="build/external-patch/sources" /> + <!-- ... 3. Applies patch 'external/xml-resolver-1.2-netbeans.patch --> + <patch dir="build/external-patch/sources" + patchfile="external/xml-resolver-1.2-netbeans.patch" + strip="0" /> + <!-- ... 4. Compiles sources to build/external-patch/classes --> + <mkdir dir="build/external-patch/classes" /> + <javac srcdir="build/external-patch/sources" + destdir="build/external-patch/classes" > + <exclude name="org/apache/xml/resolver/tests/**" /> + </javac> + <!-- ... 5. Creates a jar in 'external/resolver-1.2.jar' --> + <jar destfile="external/resolver-1.2.jar"> + <fileset dir="build/external-patch/classes" /> + </jar> + </target> + + <!-- Hook into harness "basic-init" task --> + <target name="-javac-init" depends="-prepare-patched-binary, projectized-common.-javac-init" /> </project> diff --git a/o.apache.xml.resolver/external/README-xml-resolver-1.2-netbeans.patch b/o.apache.xml.resolver/external/README-xml-resolver-1.2-netbeans.patch new file mode 100644 index 000000000..20f283751 --- /dev/null +++ b/o.apache.xml.resolver/external/README-xml-resolver-1.2-netbeans.patch @@ -0,0 +1,23 @@ +The "xml-resolver-1.2-netbeans.patch" was created in 2017 for the donation of NetBeans to the Apache Foundation. + +The patch is licensed under the Apache 2.0 License. See [1] for license information. + +The patch is to be applied to the Apache XML Commons Resolver version 1.2 sources as downloaded from Maven Central [2] + +The patch contains the modifications detailed in "readme.txt", i.e.: + - The method "getPublicIDs()" in org/apache/xml/resolver/Catalog.java + - The special "if" clause in org/apache/xml/resolver/CatalogManager.java#readProperties() + - The org/apache/xml/resolver/NbCatalogManager.java new class. + - The org/apache/xml/resolver/tools/NbCatalogResolver.java new class. + +Note that for historic reasons the sources from Maven Central contain +MS-DOS/Windows line endings, so the patch also uses these line endings, that +must be preserved. + + + +[1] http://mail-archives.apache.org/mod_mbox/incubator-netbeans-dev/201710.mbox/browser +[2] http://repo1.maven.org/maven2/xml-resolver/xml-resolver/1.2/xml-resolver-1.2-sources.jar +[3] https://netbeans.org/bugzilla/show_bug.cgi?id=128678#c17 + + diff --git a/o.apache.xml.resolver/external/binaries-list b/o.apache.xml.resolver/external/binaries-list index 4db0e8a1f..34aab9888 100644 --- a/o.apache.xml.resolver/external/binaries-list +++ b/o.apache.xml.resolver/external/binaries-list @@ -14,4 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3 resolver-1.2.jar +# +6B72432EA1C5296783007365BB7C9A6B39DFB730 xml-resolver:xml-resolver:1.2:sources diff --git a/o.apache.xml.resolver/external/resolver-1.2-notice.txt b/o.apache.xml.resolver/external/resolver-1.2-notice.txt new file mode 100644 index 000000000..214dadd56 --- /dev/null +++ b/o.apache.xml.resolver/external/resolver-1.2-notice.txt @@ -0,0 +1,9 @@ +Apache XML Commons Resolver +Copyright 2006 The Apache Software Foundation. + +This product includes software developed at +The Apache Software Foundation http://www.apache.org/ + +Portions of this code are derived from classes placed in the +public domain by Arbortext on 10 Apr 2000. See: +http://www.arbortext.com/customer_support/updates_and_technical_notes/catalogs/docs/README.htm diff --git a/o.apache.xml.resolver/external/xml-resolver-1.2-netbeans.patch b/o.apache.xml.resolver/external/xml-resolver-1.2-netbeans.patch new file mode 100644 index 000000000..5dd98b55b --- /dev/null +++ b/o.apache.xml.resolver/external/xml-resolver-1.2-netbeans.patch @@ -0,0 +1,874 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +diff -ruN org/apache/xml/resolver/Catalog.java patched-org/apache/xml/resolver/Catalog.java +--- org/apache/xml/resolver/Catalog.java 2006-11-20 15:23:08.000000000 +0100 ++++ patched-org/apache/xml/resolver/Catalog.java 2017-10-21 08:26:49.650587000 +0200 +@@ -393,6 +393,26 @@ + } + + /** ++ * Return all registered public IDs. ++ * This method added for solving the following issues in NetBeans codebase: ++ * http://www.netbeans.org/issues/show_bug.cgi?id=98212 ++ * and ++ * http://www.netbeans.org/issues/show_bug.cgi?id=112679 ++ */ ++ public java.util.Iterator getPublicIDs() { ++ Vector v = new Vector(); ++ Enumeration enumeration = catalogEntries.elements(); ++ ++ while (enumeration.hasMoreElements()) { ++ CatalogEntry e = (CatalogEntry) enumeration.nextElement(); ++ if (e.getEntryType() == PUBLIC) { ++ v.add(e.getEntryArg(0)); ++ } ++ } ++ return v.iterator(); ++ } ++ ++ /** + * Setup readers. + */ + public void setupReaders() { +diff -ruN org/apache/xml/resolver/CatalogManager.java patched-org/apache/xml/resolver/CatalogManager.java +--- org/apache/xml/resolver/CatalogManager.java 2006-11-20 15:23:08.000000000 +0100 ++++ patched-org/apache/xml/resolver/CatalogManager.java 2017-10-21 08:27:26.850588000 +0200 +@@ -239,6 +239,9 @@ + * resources from it. + */ + private synchronized void readProperties() { ++ if (propertyFile == null) { ++ return; ++ } + try { + propertyFileURI = CatalogManager.class.getResource("/"+propertyFile); + InputStream in = +diff -ruN org/apache/xml/resolver/NbCatalogManager.java patched-org/apache/xml/resolver/NbCatalogManager.java +--- org/apache/xml/resolver/NbCatalogManager.java 1970-01-01 01:00:00.000000000 +0100 ++++ patched-org/apache/xml/resolver/NbCatalogManager.java 2017-10-22 15:12:38.608007524 +0200 +@@ -0,0 +1,570 @@ ++/* ++ * Licensed to the Apache Software Foundation (ASF) under one or more ++ * contributor license agreements. See the NOTICE file distributed with ++ * this work for additional information regarding copyright ownership. ++ * The ASF licenses this file to You under the Apache License, Version 2.0 ++ * (the "License"); you may not use this file except in compliance with ++ * the License. You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ */ ++package org.apache.xml.resolver; ++ ++import java.io.IOException; ++import java.io.InputStream; ++import java.io.PrintStream; ++import java.net.MalformedURLException; ++import java.net.URL; ++import java.util.MissingResourceException; ++import java.util.PropertyResourceBundle; ++import java.util.ResourceBundle; ++import java.util.StringTokenizer; ++import java.util.Vector; ++import org.apache.xml.resolver.helpers.BootstrapResolver; ++import org.apache.xml.resolver.helpers.Debug; ++ ++public class NbCatalogManager ++ extends CatalogManager ++{ ++ private static String pFiles = "xml.catalog.files"; ++ private static String pVerbosity = "xml.catalog.verbosity"; ++ private static String pPrefer = "xml.catalog.prefer"; ++ private static String pStatic = "xml.catalog.staticCatalog"; ++ private static String pAllowPI = "xml.catalog.allowPI"; ++ private static String pClassname = "xml.catalog.className"; ++ private static String pIgnoreMissing = "xml.catalog.ignoreMissing"; ++ private static NbCatalogManager staticManager = new NbCatalogManager(); ++ private BootstrapResolver bResolver = new BootstrapResolver(); ++ private boolean ignoreMissingProperties = (System.getProperty(pIgnoreMissing) != null) || (System.getProperty(pFiles) != null); ++ private ResourceBundle resources; ++ private String propertyFile = "CatalogManager.properties"; ++ private URL propertyFileURI = null; ++ private String defaultCatalogFiles = "./xcatalog"; ++ private String catalogFiles = null; ++ private boolean fromPropertiesFile = false; ++ private int defaultVerbosity = 1; ++ private Integer verbosity = null; ++ private boolean defaultPreferPublic = true; ++ private Boolean preferPublic = null; ++ private boolean defaultUseStaticCatalog = true; ++ private Boolean useStaticCatalog = null; ++ private static Catalog staticCatalog = null; ++ private boolean defaultOasisXMLCatalogPI = true; ++ private Boolean oasisXMLCatalogPI = null; ++ private boolean defaultRelativeCatalogs = true; ++ private Boolean relativeCatalogs = null; ++ private String catalogClassName = null; ++ public Debug debug = null; ++ ++ public NbCatalogManager() ++ { ++ this.debug = new Debug(); ++ } ++ ++ public NbCatalogManager(String propertyFile) ++ { ++ this.propertyFile = propertyFile; ++ ++ this.debug = new Debug(); ++ } ++ ++ public void setBootstrapResolver(BootstrapResolver resolver) ++ { ++ this.bResolver = resolver; ++ } ++ ++ public BootstrapResolver getBootstrapResolver() ++ { ++ return this.bResolver; ++ } ++ ++ private synchronized void readProperties() ++ { ++ if (this.propertyFile == null) { ++ return; ++ } ++ try ++ { ++ this.propertyFileURI = NbCatalogManager.class.getResource("/" + this.propertyFile); ++ InputStream in = NbCatalogManager.class.getResourceAsStream("/" + this.propertyFile); ++ if (in == null) ++ { ++ if (!this.ignoreMissingProperties) ++ { ++ this.debug.message(2, "Cannot find " + this.propertyFile); ++ ++ this.ignoreMissingProperties = true; ++ } ++ return; ++ } ++ this.resources = new PropertyResourceBundle(in); ++ } ++ catch (MissingResourceException mre) ++ { ++ if (!this.ignoreMissingProperties) { ++ System.err.println("Cannot read " + this.propertyFile); ++ } ++ } ++ catch (IOException e) ++ { ++ if (!this.ignoreMissingProperties) { ++ System.err.println("Failure trying to read " + this.propertyFile); ++ } ++ } ++ if (this.verbosity == null) { ++ try ++ { ++ String verbStr = this.resources.getString("verbosity"); ++ int verb = Integer.parseInt(verbStr.trim()); ++ this.debug.setDebug(verb); ++ this.verbosity = new Integer(verb); ++ } ++ catch (Exception e) {} ++ } ++ } ++ ++ public static CatalogManager getStaticManager() ++ { ++ return staticManager; ++ } ++ ++ public boolean getIgnoreMissingProperties() ++ { ++ return this.ignoreMissingProperties; ++ } ++ ++ public void setIgnoreMissingProperties(boolean ignore) ++ { ++ this.ignoreMissingProperties = ignore; ++ } ++ ++ /** ++ * @deprecated ++ */ ++ public void ignoreMissingProperties(boolean ignore) ++ { ++ setIgnoreMissingProperties(ignore); ++ } ++ ++ private int queryVerbosity() ++ { ++ String defaultVerbStr = Integer.toString(this.defaultVerbosity); ++ ++ String verbStr = System.getProperty(pVerbosity); ++ if (verbStr == null) ++ { ++ if (this.resources == null) { ++ readProperties(); ++ } ++ if (this.resources != null) { ++ try ++ { ++ verbStr = this.resources.getString("verbosity"); ++ } ++ catch (MissingResourceException e) ++ { ++ verbStr = defaultVerbStr; ++ } ++ } else { ++ verbStr = defaultVerbStr; ++ } ++ } ++ int verb = this.defaultVerbosity; ++ try ++ { ++ verb = Integer.parseInt(verbStr.trim()); ++ } ++ catch (Exception e) ++ { ++ System.err.println("Cannot parse verbosity: \"" + verbStr + "\""); ++ } ++ if (this.verbosity == null) ++ { ++ this.debug.setDebug(verb); ++ this.verbosity = new Integer(verb); ++ } ++ return verb; ++ } ++ ++ public int getVerbosity() ++ { ++ if (this.verbosity == null) { ++ this.verbosity = new Integer(queryVerbosity()); ++ } ++ return this.verbosity.intValue(); ++ } ++ ++ public void setVerbosity(int verbosity) ++ { ++ this.verbosity = new Integer(verbosity); ++ this.debug.setDebug(verbosity); ++ } ++ ++ /** ++ * @deprecated ++ */ ++ public int verbosity() ++ { ++ return getVerbosity(); ++ } ++ ++ private boolean queryRelativeCatalogs() ++ { ++ if (this.resources == null) { ++ readProperties(); ++ } ++ if (this.resources == null) { ++ return this.defaultRelativeCatalogs; ++ } ++ try ++ { ++ String allow = this.resources.getString("relative-catalogs"); ++ return (allow.equalsIgnoreCase("true")) || (allow.equalsIgnoreCase("yes")) || (allow.equalsIgnoreCase("1")); ++ } ++ catch (MissingResourceException e) {} ++ return this.defaultRelativeCatalogs; ++ } ++ ++ public boolean getRelativeCatalogs() ++ { ++ if (this.relativeCatalogs == null) { ++ this.relativeCatalogs = new Boolean(queryRelativeCatalogs()); ++ } ++ return this.relativeCatalogs.booleanValue(); ++ } ++ ++ public void setRelativeCatalogs(boolean relative) ++ { ++ this.relativeCatalogs = new Boolean(relative); ++ } ++ ++ /** ++ * @deprecated ++ */ ++ public boolean relativeCatalogs() ++ { ++ return getRelativeCatalogs(); ++ } ++ ++ private String queryCatalogFiles() ++ { ++ String catalogList = System.getProperty(pFiles); ++ this.fromPropertiesFile = false; ++ if (catalogList == null) ++ { ++ if (this.resources == null) { ++ readProperties(); ++ } ++ if (this.resources != null) { ++ try ++ { ++ catalogList = this.resources.getString("catalogs"); ++ this.fromPropertiesFile = true; ++ } ++ catch (MissingResourceException e) ++ { ++ System.err.println(this.propertyFile + ": catalogs not found."); ++ catalogList = null; ++ } ++ } ++ } ++ if (catalogList == null) { ++ catalogList = this.defaultCatalogFiles; ++ } ++ return catalogList; ++ } ++ ++ public Vector getCatalogFiles() ++ { ++ if (this.catalogFiles == null) { ++ this.catalogFiles = queryCatalogFiles(); ++ } ++ StringTokenizer files = new StringTokenizer(this.catalogFiles, ";"); ++ Vector catalogs = new Vector(); ++ while (files.hasMoreTokens()) ++ { ++ String catalogFile = files.nextToken(); ++ URL absURI = null; ++ if ((this.fromPropertiesFile) && (!relativeCatalogs())) { ++ try ++ { ++ absURI = new URL(this.propertyFileURI, catalogFile); ++ catalogFile = absURI.toString(); ++ } ++ catch (MalformedURLException mue) ++ { ++ absURI = null; ++ } ++ } ++ catalogs.add(catalogFile); ++ } ++ return catalogs; ++ } ++ ++ public void setCatalogFiles(String fileList) ++ { ++ this.catalogFiles = fileList; ++ this.fromPropertiesFile = false; ++ } ++ ++ /** ++ * @deprecated ++ */ ++ public Vector catalogFiles() ++ { ++ return getCatalogFiles(); ++ } ++ ++ private boolean queryPreferPublic() ++ { ++ String prefer = System.getProperty(pPrefer); ++ if (prefer == null) ++ { ++ if (this.resources == null) { ++ readProperties(); ++ } ++ if (this.resources == null) { ++ return this.defaultPreferPublic; ++ } ++ try ++ { ++ prefer = this.resources.getString("prefer"); ++ } ++ catch (MissingResourceException e) ++ { ++ return this.defaultPreferPublic; ++ } ++ } ++ if (prefer == null) { ++ return this.defaultPreferPublic; ++ } ++ return prefer.equalsIgnoreCase("public"); ++ } ++ ++ public boolean getPreferPublic() ++ { ++ if (this.preferPublic == null) { ++ this.preferPublic = new Boolean(queryPreferPublic()); ++ } ++ return this.preferPublic.booleanValue(); ++ } ++ ++ public void setPreferPublic(boolean preferPublic) ++ { ++ this.preferPublic = new Boolean(preferPublic); ++ } ++ ++ /** ++ * @deprecated ++ */ ++ public boolean preferPublic() ++ { ++ return getPreferPublic(); ++ } ++ ++ private boolean queryUseStaticCatalog() ++ { ++ String staticCatalog = System.getProperty(pStatic); ++ if (staticCatalog == null) ++ { ++ if (this.resources == null) { ++ readProperties(); ++ } ++ if (this.resources == null) { ++ return this.defaultUseStaticCatalog; ++ } ++ try ++ { ++ staticCatalog = this.resources.getString("static-catalog"); ++ } ++ catch (MissingResourceException e) ++ { ++ return this.defaultUseStaticCatalog; ++ } ++ } ++ if (staticCatalog == null) { ++ return this.defaultUseStaticCatalog; ++ } ++ return (staticCatalog.equalsIgnoreCase("true")) || (staticCatalog.equalsIgnoreCase("yes")) || (staticCatalog.equalsIgnoreCase("1")); ++ } ++ ++ public boolean getUseStaticCatalog() ++ { ++ if (this.useStaticCatalog == null) { ++ this.useStaticCatalog = new Boolean(queryUseStaticCatalog()); ++ } ++ return this.useStaticCatalog.booleanValue(); ++ } ++ ++ public void setUseStaticCatalog(boolean useStatic) ++ { ++ this.useStaticCatalog = new Boolean(useStatic); ++ } ++ ++ /** ++ * @deprecated ++ */ ++ public boolean staticCatalog() ++ { ++ return getUseStaticCatalog(); ++ } ++ ++ public Catalog getPrivateCatalog() ++ { ++ Catalog catalog = staticCatalog; ++ if (this.useStaticCatalog == null) { ++ this.useStaticCatalog = new Boolean(getUseStaticCatalog()); ++ } ++ if ((catalog == null) || (!this.useStaticCatalog.booleanValue())) ++ { ++ try ++ { ++ String catalogClassName = getCatalogClassName(); ++ if (catalogClassName == null) { ++ catalog = new Catalog(); ++ } else { ++ try ++ { ++ catalog = (Catalog)Class.forName(catalogClassName).newInstance(); ++ } ++ catch (ClassNotFoundException cnfe) ++ { ++ this.debug.message(1, "Catalog class named '" + catalogClassName + "' could not be found. Using default."); ++ ++ catalog = new Catalog(); ++ } ++ catch (ClassCastException cnfe) ++ { ++ this.debug.message(1, "Class named '" + catalogClassName + "' is not a Catalog. Using default."); ++ ++ catalog = new Catalog(); ++ } ++ } ++ catalog.setCatalogManager(this); ++ catalog.setupReaders(); ++ catalog.loadSystemCatalogs(); ++ } ++ catch (Exception ex) ++ { ++ ex.printStackTrace(); ++ } ++ if (this.useStaticCatalog.booleanValue()) { ++ staticCatalog = catalog; ++ } ++ } ++ return catalog; ++ } ++ ++ public Catalog getCatalog() ++ { ++ Catalog catalog = staticCatalog; ++ if (this.useStaticCatalog == null) { ++ this.useStaticCatalog = new Boolean(getUseStaticCatalog()); ++ } ++ if ((catalog == null) || (!this.useStaticCatalog.booleanValue())) ++ { ++ catalog = getPrivateCatalog(); ++ if (this.useStaticCatalog.booleanValue()) { ++ staticCatalog = catalog; ++ } ++ } ++ return catalog; ++ } ++ ++ public boolean queryAllowOasisXMLCatalogPI() ++ { ++ String allow = System.getProperty(pAllowPI); ++ if (allow == null) ++ { ++ if (this.resources == null) { ++ readProperties(); ++ } ++ if (this.resources == null) { ++ return this.defaultOasisXMLCatalogPI; ++ } ++ try ++ { ++ allow = this.resources.getString("allow-oasis-xml-catalog-pi"); ++ } ++ catch (MissingResourceException e) ++ { ++ return this.defaultOasisXMLCatalogPI; ++ } ++ } ++ if (allow == null) { ++ return this.defaultOasisXMLCatalogPI; ++ } ++ return (allow.equalsIgnoreCase("true")) || (allow.equalsIgnoreCase("yes")) || (allow.equalsIgnoreCase("1")); ++ } ++ ++ public boolean getAllowOasisXMLCatalogPI() ++ { ++ if (this.oasisXMLCatalogPI == null) { ++ this.oasisXMLCatalogPI = new Boolean(queryAllowOasisXMLCatalogPI()); ++ } ++ return this.oasisXMLCatalogPI.booleanValue(); ++ } ++ ++ public void setAllowOasisXMLCatalogPI(boolean allowPI) ++ { ++ this.oasisXMLCatalogPI = new Boolean(allowPI); ++ } ++ ++ /** ++ * @deprecated ++ */ ++ public boolean allowOasisXMLCatalogPI() ++ { ++ return getAllowOasisXMLCatalogPI(); ++ } ++ ++ public String queryCatalogClassName() ++ { ++ String className = System.getProperty(pClassname); ++ if (className == null) ++ { ++ if (this.resources == null) { ++ readProperties(); ++ } ++ if (this.resources == null) { ++ return null; ++ } ++ try ++ { ++ return this.resources.getString("catalog-class-name"); ++ } ++ catch (MissingResourceException e) ++ { ++ return null; ++ } ++ } ++ return className; ++ } ++ ++ public String getCatalogClassName() ++ { ++ if (this.catalogClassName == null) { ++ this.catalogClassName = queryCatalogClassName(); ++ } ++ return this.catalogClassName; ++ } ++ ++ public void setCatalogClassName(String className) ++ { ++ this.catalogClassName = className; ++ } ++ ++ /** ++ * @deprecated ++ */ ++ public String catalogClassName() ++ { ++ return getCatalogClassName(); ++ } ++} +Los ficheros binarios org/apache/xml/resolver/.NbCatalogManager.java.swp y patched-org/apache/xml/resolver/.NbCatalogManager.java.swp son distintos +diff -ruN org/apache/xml/resolver/tools/NbCatalogResolver.java patched-org/apache/xml/resolver/tools/NbCatalogResolver.java +--- org/apache/xml/resolver/tools/NbCatalogResolver.java 1970-01-01 01:00:00.000000000 +0100 ++++ patched-org/apache/xml/resolver/tools/NbCatalogResolver.java 2017-10-22 15:12:54.716007923 +0200 +@@ -0,0 +1,233 @@ ++/* ++ * Licensed to the Apache Software Foundation (ASF) under one or more ++ * contributor license agreements. See the NOTICE file distributed with ++ * this work for additional information regarding copyright ownership. ++ * The ASF licenses this file to You under the Apache License, Version 2.0 ++ * (the "License"); you may not use this file except in compliance with ++ * the License. You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ */ ++package org.apache.xml.resolver.tools; ++ ++import java.io.IOException; ++import java.net.MalformedURLException; ++import java.net.URL; ++import javax.xml.parsers.ParserConfigurationException; ++import javax.xml.parsers.SAXParser; ++import javax.xml.parsers.SAXParserFactory; ++import javax.xml.transform.Source; ++import javax.xml.transform.TransformerException; ++import javax.xml.transform.URIResolver; ++import javax.xml.transform.sax.SAXSource; ++import org.apache.xml.resolver.Catalog; ++import org.apache.xml.resolver.CatalogManager; ++import org.apache.xml.resolver.NbCatalogManager; ++import org.apache.xml.resolver.helpers.Debug; ++import org.apache.xml.resolver.helpers.FileURL; ++import org.xml.sax.EntityResolver; ++import org.xml.sax.InputSource; ++import org.xml.sax.SAXException; ++import org.xml.sax.XMLReader; ++ ++public class NbCatalogResolver ++ implements EntityResolver, URIResolver ++{ ++ public boolean namespaceAware = true; ++ public boolean validating = false; ++ private Catalog catalog = null; ++ private CatalogManager catalogManager = NbCatalogManager.getStaticManager(); ++ ++ public NbCatalogResolver() ++ { ++ initializeCatalogs(false); ++ } ++ ++ public NbCatalogResolver(boolean privateCatalog) ++ { ++ initializeCatalogs(privateCatalog); ++ } ++ ++ public NbCatalogResolver(NbCatalogManager manager) ++ { ++ this.catalogManager = manager; ++ initializeCatalogs(!this.catalogManager.getUseStaticCatalog()); ++ } ++ ++ private void initializeCatalogs(boolean privateCatalog) ++ { ++ this.catalog = this.catalogManager.getCatalog(); ++ } ++ ++ public Catalog getCatalog() ++ { ++ return this.catalog; ++ } ++ ++ public String getResolvedEntity(String publicId, String systemId) ++ { ++ String resolved = null; ++ if (this.catalog == null) ++ { ++ this.catalogManager.debug.message(1, "Catalog resolution attempted with null catalog; ignored"); ++ return null; ++ } ++ if (systemId != null) { ++ try ++ { ++ resolved = this.catalog.resolveSystem(systemId); ++ } ++ catch (MalformedURLException me) ++ { ++ this.catalogManager.debug.message(1, "Malformed URL exception trying to resolve", publicId); ++ ++ resolved = null; ++ } ++ catch (IOException ie) ++ { ++ this.catalogManager.debug.message(1, "I/O exception trying to resolve", publicId); ++ resolved = null; ++ } ++ } ++ if (resolved == null) ++ { ++ if (publicId != null) { ++ try ++ { ++ resolved = this.catalog.resolvePublic(publicId, systemId); ++ } ++ catch (MalformedURLException me) ++ { ++ this.catalogManager.debug.message(1, "Malformed URL exception trying to resolve", publicId); ++ } ++ catch (IOException ie) ++ { ++ this.catalogManager.debug.message(1, "I/O exception trying to resolve", publicId); ++ } ++ } ++ if (resolved != null) { ++ this.catalogManager.debug.message(2, "Resolved public", publicId, resolved); ++ } ++ } ++ else ++ { ++ this.catalogManager.debug.message(2, "Resolved system", systemId, resolved); ++ } ++ return resolved; ++ } ++ ++ public InputSource resolveEntity(String publicId, String systemId) ++ { ++ String resolved = getResolvedEntity(publicId, systemId); ++ if (resolved != null) ++ { ++ InputSource iSource = new InputSource(resolved); ++ iSource.setPublicId(publicId); ++ return iSource; ++ } ++ return null; ++ } ++ ++ public Source resolve(String href, String base) ++ throws TransformerException ++ { ++ String uri = href; ++ String fragment = null; ++ int hashPos = href.indexOf("#"); ++ if (hashPos >= 0) ++ { ++ uri = href.substring(0, hashPos); ++ fragment = href.substring(hashPos + 1); ++ } ++ String result = null; ++ try ++ { ++ result = this.catalog.resolveURI(href); ++ } ++ catch (Exception e) {} ++ if (result == null) { ++ try ++ { ++ URL url = null; ++ if (base == null) ++ { ++ url = new URL(uri); ++ result = url.toString(); ++ } ++ else ++ { ++ URL baseURL = new URL(base); ++ url = href.length() == 0 ? baseURL : new URL(baseURL, uri); ++ result = url.toString(); ++ } ++ } ++ catch (MalformedURLException mue) ++ { ++ String absBase = makeAbsolute(base); ++ if (!absBase.equals(base)) { ++ return resolve(href, absBase); ++ } ++ throw new TransformerException("Malformed URL " + href + "(base " + base + ")", mue); ++ } ++ } ++ this.catalogManager.debug.message(2, "Resolved URI", href, result); ++ ++ SAXSource source = new SAXSource(); ++ source.setInputSource(new InputSource(result)); ++ setEntityResolver(source); ++ return source; ++ } ++ ++ private void setEntityResolver(SAXSource source) ++ throws TransformerException ++ { ++ XMLReader reader = source.getXMLReader(); ++ if (reader == null) ++ { ++ SAXParserFactory spFactory = SAXParserFactory.newInstance(); ++ spFactory.setNamespaceAware(true); ++ try ++ { ++ reader = spFactory.newSAXParser().getXMLReader(); ++ } ++ catch (ParserConfigurationException ex) ++ { ++ throw new TransformerException(ex); ++ } ++ catch (SAXException ex) ++ { ++ throw new TransformerException(ex); ++ } ++ } ++ reader.setEntityResolver(this); ++ source.setXMLReader(reader); ++ } ++ ++ private String makeAbsolute(String uri) ++ { ++ if (uri == null) { ++ uri = ""; ++ } ++ try ++ { ++ URL url = new URL(uri); ++ return url.toString(); ++ } ++ catch (MalformedURLException mue) ++ { ++ try ++ { ++ URL fileURL = FileURL.makeURL(uri); ++ return fileURL.toString(); ++ } ++ catch (MalformedURLException mue2) {} ++ } ++ return uri; ++ } ++} +Los ficheros binarios org/apache/xml/resolver/tools/.NbCatalogResolver.java.swp y patched-org/apache/xml/resolver/tools/.NbCatalogResolver.java.swp son distintos +Los ficheros binarios org/apache/xml/resolver/.Version.java.swp y patched-org/apache/xml/resolver/.Version.java.swp son distintos diff --git a/o.apache.xmlrpc/external/binaries-list b/o.apache.xmlrpc/external/binaries-list index 37ee4e783..bec111eab 100644 --- a/o.apache.xmlrpc/external/binaries-list +++ b/o.apache.xmlrpc/external/binaries-list @@ -14,6 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983 xmlrpc-client-3.0.jar -8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF xmlrpc-common-3.0.jar -D6917BF718583002CBE44E773EE21E2DF08ADC71 xmlrpc-server-3.0.jar +64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983 org.apache.xmlrpc:xmlrpc-client:3.0 +8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF org.apache.xmlrpc:xmlrpc-common:3.0 +D6917BF718583002CBE44E773EE21E2DF08ADC71 org.apache.xmlrpc:xmlrpc-server:3.0 + diff --git a/o.eclipse.core.contenttype/external/binaries-list b/o.eclipse.core.contenttype/external/binaries-list index 5844e6363..bed0711d0 100644 --- a/o.eclipse.core.contenttype/external/binaries-list +++ b/o.eclipse.core.contenttype/external/binaries-list @@ -14,4 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -AA2671239EBB762FEEE8B908E9F35473A72AFE1B org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar +# AA2671239EBB762FEEE8B908E9F35473A72AFE1B org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar +1232EFBDE2930D21D106850BD166C9B27F743BA8 org.jibx.config.3rdparty.org.eclipse:org.eclipse.core.contenttype:3.4.100.v20110423-0524 diff --git a/o.eclipse.core.contenttype/nbproject/project.properties b/o.eclipse.core.contenttype/nbproject/project.properties index 63d4653b7..fc8b43bf5 100644 --- a/o.eclipse.core.contenttype/nbproject/project.properties +++ b/o.eclipse.core.contenttype/nbproject/project.properties @@ -14,6 +14,6 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -release.external/org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar=modules/org-eclipse-core-contenttype.jar +release.external/org.eclipse.core.contenttype-3.4.100.v20110423-0524.jar=modules/org-eclipse-core-contenttype.jar is.autoload=true -nbm.module.author=Tomas Stupka \ No newline at end of file +nbm.module.author=Tomas Stupka diff --git a/o.eclipse.core.contenttype/nbproject/project.xml b/o.eclipse.core.contenttype/nbproject/project.xml index 79dc71786..c50b0bdd5 100644 --- a/o.eclipse.core.contenttype/nbproject/project.xml +++ b/o.eclipse.core.contenttype/nbproject/project.xml @@ -28,8 +28,8 @@ <public-packages/> <class-path-extension> <runtime-relative-path>org-eclipse-core-contenttype.jar</runtime-relative-path> - <binary-origin>external/org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar</binary-origin> + <binary-origin>external/org.eclipse.core.contenttype-3.4.100.v20110423-0524.jar</binary-origin> </class-path-extension> </data> </configuration> -</project> \ No newline at end of file +</project> diff --git a/o.eclipse.core.jobs/external/binaries-list b/o.eclipse.core.jobs/external/binaries-list index 399b8ea65..d1d4f5841 100644 --- a/o.eclipse.core.jobs/external/binaries-list +++ b/o.eclipse.core.jobs/external/binaries-list @@ -14,4 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -1605B38BB28EAE32C11EAB8F9E238A497754A5B8 org.eclipse.core.jobs-3.5.101_nosignature.jar +#1605B38BB28EAE32C11EAB8F9E238A497754A5B8 org.eclipse.core.jobs-3.5.101_nosignature.jar +7E99E30A7F23423A250744AF33009FC2FBCDF241 org.eclipse.core:org.eclipse.core.jobs:3.5.100 diff --git a/o.eclipse.core.jobs/nbproject/project.properties b/o.eclipse.core.jobs/nbproject/project.properties index 109b505fe..8b30f1bb6 100644 --- a/o.eclipse.core.jobs/nbproject/project.properties +++ b/o.eclipse.core.jobs/nbproject/project.properties @@ -14,6 +14,6 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -release.external/org.eclipse.core.jobs-3.5.101_nosignature.jar=modules/org-eclipse-core-jobs.jar +release.external/org.eclipse.core.jobs-3.5.100.jar=modules/org-eclipse-core-jobs.jar is.autoload=true nbm.module.author=Tomas Stupka diff --git a/o.eclipse.core.jobs/nbproject/project.xml b/o.eclipse.core.jobs/nbproject/project.xml index 090b57e60..5447781e8 100644 --- a/o.eclipse.core.jobs/nbproject/project.xml +++ b/o.eclipse.core.jobs/nbproject/project.xml @@ -36,7 +36,7 @@ </public-packages> <class-path-extension> <runtime-relative-path>org-eclipse-core-jobs.jar</runtime-relative-path> - <binary-origin>external/org.eclipse.core.jobs-3.5.101_nosignature.jar</binary-origin> + <binary-origin>external/org.eclipse.core.jobs-3.5.100.jar</binary-origin> </class-path-extension> </data> </configuration> diff --git a/o.eclipse.jgit.java7/external/binaries-list b/o.eclipse.jgit.java7/external/binaries-list index ed0d3dc7b..575511cc0 100644 --- a/o.eclipse.jgit.java7/external/binaries-list +++ b/o.eclipse.jgit.java7/external/binaries-list @@ -14,4 +14,4 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -244560B99152F3F9BC75DF2D6FAFA8A5216B06B6 org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar +D613D2ED86455CC8686A45B9B65215A9652E2943 org.eclipse.jgit:org.eclipse.jgit.java7:3.6.2.201501210735-r diff --git a/o.eclipse.jgit.java7/nbproject/project.properties b/o.eclipse.jgit.java7/nbproject/project.properties index 58f408ecf..3d6d8a4b0 100644 --- a/o.eclipse.jgit.java7/nbproject/project.properties +++ b/o.eclipse.jgit.java7/nbproject/project.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -release.external/org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar=modules/org-eclipse-jgit-java7.jar +release.external/org.eclipse.jgit.java7-3.6.2.201501210735-r.jar=modules/org-eclipse-jgit-java7.jar is.autoload=true diff --git a/o.eclipse.jgit.java7/nbproject/project.xml b/o.eclipse.jgit.java7/nbproject/project.xml index 42b292ac5..a23b2b817 100644 --- a/o.eclipse.jgit.java7/nbproject/project.xml +++ b/o.eclipse.jgit.java7/nbproject/project.xml @@ -28,7 +28,7 @@ <public-packages/> <class-path-extension> <runtime-relative-path>org-eclipse-jgit-java7.jar</runtime-relative-path> - <binary-origin>external/org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar</binary-origin> + <binary-origin>external/org.eclipse.jgit.java7-3.6.2.201501210735-r.jar</binary-origin> </class-path-extension> </data> </configuration> diff --git a/o.eclipse.jgit/external/binaries-list b/o.eclipse.jgit/external/binaries-list index e39ad483f..3e2ad617d 100644 --- a/o.eclipse.jgit/external/binaries-list +++ b/o.eclipse.jgit/external/binaries-list @@ -14,4 +14,4 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -B580E446B543A8DD2F5AA368B07F9C4C9C2E7029 org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar +47D59DFFB5F02470CCFB6C1A5A31B6040A1636E5 org.eclipse.jgit:org.eclipse.jgit:3.6.2.201501210735-r diff --git a/o.eclipse.jgit/nbproject/project.properties b/o.eclipse.jgit/nbproject/project.properties index 72e2d0f12..de1e85e82 100644 --- a/o.eclipse.jgit/nbproject/project.properties +++ b/o.eclipse.jgit/nbproject/project.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -release.external/org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar=modules/org-eclipse-jgit.jar +release.external/org.eclipse.jgit-3.6.2.201501210735-r.jar=modules/org-eclipse-jgit.jar is.autoload=true diff --git a/o.eclipse.jgit/nbproject/project.xml b/o.eclipse.jgit/nbproject/project.xml index de9629dea..b3b7a7365 100644 --- a/o.eclipse.jgit/nbproject/project.xml +++ b/o.eclipse.jgit/nbproject/project.xml @@ -41,7 +41,7 @@ <public-packages/> <class-path-extension> <runtime-relative-path>org-eclipse-jgit.jar</runtime-relative-path> - <binary-origin>external/org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar</binary-origin> + <binary-origin>external/org.eclipse.jgit-3.6.2.201501210735-r.jar</binary-origin> </class-path-extension> </data> </configuration> diff --git a/o.n.bootstrap/launcher/unix/nbexec b/o.n.bootstrap/launcher/unix/nbexec index acd0b0eec..df47fa01e 100644 --- a/o.n.bootstrap/launcher/unix/nbexec +++ b/o.n.bootstrap/launcher/unix/nbexec @@ -81,6 +81,10 @@ EOF nosplash="nosplash"; args="$args --nosplash" ;; + --nogui) + nogui="nogui"; + args="$args --nogui" + ;; --jdkhome) shift; if [ $# -gt 0 ] ; then jdkhome=$1; fi ;; # this has to be here for purposes of updater.jar, but it should be @@ -356,7 +360,7 @@ J2D_PIXMAPS=shared export J2D_PIXMAPS # Check DISPLAY variable on non-Mac -if [ "no$DISPLAY" = "no" -a `uname` != Darwin ]; then +if [ "no$DISPLAY" = "no" -a `uname` != Darwin -a -z "$nogui" ]; then echo "$0: WARNING: environment variable DISPLAY is not set" fi diff --git a/o.n.core/l10n.list b/o.n.core/l10n.list index e97c35aad..abefe6c2e 100644 --- a/o.n.core/l10n.list +++ b/o.n.core/l10n.list @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# # core # explicit exclude for core/javahelp, what is regular module ${l10n-module}/src/**/Bundle*.properties diff --git a/o.n.core/test/qa-functional/data/SampleProject/build.xml b/o.n.core/test/qa-functional/data/SampleProject/build.xml index 2c7ac9fbd..3d23542ba 100644 --- a/o.n.core/test/qa-functional/data/SampleProject/build.xml +++ b/o.n.core/test/qa-functional/data/SampleProject/build.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- You may freely edit this file. See commented blocks below for --> <!-- some examples of how to customize the build. --> <!-- (If you delete it and reopen the project it will be recreated.) --> diff --git a/o.n.core/test/qa-functional/data/SampleProject/nbproject/project.properties b/o.n.core/test/qa-functional/data/SampleProject/nbproject/project.properties index 42e333887..8eb8615f0 100644 --- a/o.n.core/test/qa-functional/data/SampleProject/nbproject/project.properties +++ b/o.n.core/test/qa-functional/data/SampleProject/nbproject/project.properties @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + application.args= build.classes.dir=${build.dir}/classes build.classes.excludes=**/*.java,**/*.form diff --git a/o.n.core/test/qa-functional/data/SampleProject/nbproject/project.xml b/o.n.core/test/qa-functional/data/SampleProject/nbproject/project.xml index 3843ea27c..25e575b57 100644 --- a/o.n.core/test/qa-functional/data/SampleProject/nbproject/project.xml +++ b/o.n.core/test/qa-functional/data/SampleProject/nbproject/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.java.j2seproject</type> <configuration> diff --git a/o.n.core/test/unit/data/lookup/services-jar-1/META-INF/services/org.foo.Interface b/o.n.core/test/unit/data/lookup/services-jar-1/META-INF/services/org.foo.Interface index cefec66c4..95d3d2346 100644 --- a/o.n.core/test/unit/data/lookup/services-jar-1/META-INF/services/org.foo.Interface +++ b/o.n.core/test/unit/data/lookup/services-jar-1/META-INF/services/org.foo.Interface @@ -1,3 +1,21 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + # Some header info, maybe. # Our first impl here: diff --git a/o.n.core/test/unit/data/lookup/services-jar-2/META-INF/services/org.foo.Interface b/o.n.core/test/unit/data/lookup/services-jar-2/META-INF/services/org.foo.Interface index f3601a6f9..cc6abd26a 100644 --- a/o.n.core/test/unit/data/lookup/services-jar-2/META-INF/services/org.foo.Interface +++ b/o.n.core/test/unit/data/lookup/services-jar-2/META-INF/services/org.foo.Interface @@ -1 +1,18 @@ -org.bar.Implementation2 +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +org.bar.Implementation2 \ No newline at end of file diff --git a/o.n.swing.plaf/l10n.list b/o.n.swing.plaf/l10n.list index fb8099312..5bf631ba6 100644 --- a/o.n.swing.plaf/l10n.list +++ b/o.n.swing.plaf/l10n.list @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# # core/swing/plaf read global ${l10n-module}/src/org/netbeans/swing/plaf/aqua/*.png diff --git a/o.openidex.util/test/unit/data/projects/Project1/build.xml b/o.openidex.util/test/unit/data/projects/Project1/build.xml index a1aee56f2..11db0cb1a 100644 --- a/o.openidex.util/test/unit/data/projects/Project1/build.xml +++ b/o.openidex.util/test/unit/data/projects/Project1/build.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- You may freely edit this file. See commented blocks below for --> <!-- some examples of how to customize the build. --> <!-- (If you delete it and reopen the project it will be recreated.) --> diff --git a/o.openidex.util/test/unit/data/projects/Project1/nbproject/project.properties b/o.openidex.util/test/unit/data/projects/Project1/nbproject/project.properties index 51d8acb2d..bd0f31ee0 100644 --- a/o.openidex.util/test/unit/data/projects/Project1/nbproject/project.properties +++ b/o.openidex.util/test/unit/data/projects/Project1/nbproject/project.properties @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + application.args= build.classes.dir=${build.dir}/classes build.classes.excludes=**/*.java,**/*.form diff --git a/o.openidex.util/test/unit/data/projects/Project1/nbproject/project.xml b/o.openidex.util/test/unit/data/projects/Project1/nbproject/project.xml index d4cb35305..d0f81fdb6 100644 --- a/o.openidex.util/test/unit/data/projects/Project1/nbproject/project.xml +++ b/o.openidex.util/test/unit/data/projects/Project1/nbproject/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.java.j2seproject</type> <configuration> diff --git a/openide.loaders/l10n.list b/openide.loaders/l10n.list index da83f2d22..52ed7bf72 100644 --- a/openide.loaders/l10n.list +++ b/openide.loaders/l10n.list @@ -1,44 +1,20 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. +# http://www.apache.org/licenses/LICENSE-2.0 # -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. # -# Contributor(s): -# -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. # openide/loaders read global exclude ${l10n-module}/test/**/*.url diff --git a/openide.util.lookup/src/META-INF/services/javax.annotation.processing.Processor b/openide.util.lookup/src/META-INF/services/javax.annotation.processing.Processor index 1a11806cd..18fd20a47 100644 --- a/openide.util.lookup/src/META-INF/services/javax.annotation.processing.Processor +++ b/openide.util.lookup/src/META-INF/services/javax.annotation.processing.Processor @@ -1,2 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# org.netbeans.modules.openide.util.ServiceProviderProcessor org.netbeans.modules.openide.util.NamedServiceProcessor \ No newline at end of file diff --git a/performance.java/test/qa-functional/data/PerformanceTestData/build.xml b/performance.java/test/qa-functional/data/PerformanceTestData/build.xml index 09356be55..71bec87b5 100644 --- a/performance.java/test/qa-functional/data/PerformanceTestData/build.xml +++ b/performance.java/test/qa-functional/data/PerformanceTestData/build.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- You may freely edit this file. See commented blocks below for --> <!-- some examples of how to customize the build. --> <!-- (If you delete it and reopen the project it will be recreated.) --> diff --git a/performance.java/test/qa-functional/data/PerformanceTestData/nbproject/project.properties b/performance.java/test/qa-functional/data/PerformanceTestData/nbproject/project.properties index 84d78e838..6c4128159 100644 --- a/performance.java/test/qa-functional/data/PerformanceTestData/nbproject/project.properties +++ b/performance.java/test/qa-functional/data/PerformanceTestData/nbproject/project.properties @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + application.args= application.title=PerformanceTestData application.vendor=tester diff --git a/performance.java/test/qa-functional/data/PerformanceTestData/nbproject/project.xml b/performance.java/test/qa-functional/data/PerformanceTestData/nbproject/project.xml index 0886f04a4..4503ee252 100644 --- a/performance.java/test/qa-functional/data/PerformanceTestData/nbproject/project.xml +++ b/performance.java/test/qa-functional/data/PerformanceTestData/nbproject/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.java.j2seproject</type> <configuration> diff --git a/performance.java/test/qa-functional/data/PerformanceTestFoldersData/build.xml b/performance.java/test/qa-functional/data/PerformanceTestFoldersData/build.xml index 1e0d15b08..abdb1a4e1 100644 --- a/performance.java/test/qa-functional/data/PerformanceTestFoldersData/build.xml +++ b/performance.java/test/qa-functional/data/PerformanceTestFoldersData/build.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- You may freely edit this file. See commented blocks below for --> <!-- some examples of how to customize the build. --> <!-- (If you delete it and reopen the project it will be recreated.) --> diff --git a/performance.java/test/qa-functional/data/PerformanceTestFoldersData/nbproject/project.properties b/performance.java/test/qa-functional/data/PerformanceTestFoldersData/nbproject/project.properties index 6229f476e..078aa993e 100644 --- a/performance.java/test/qa-functional/data/PerformanceTestFoldersData/nbproject/project.properties +++ b/performance.java/test/qa-functional/data/PerformanceTestFoldersData/nbproject/project.properties @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + application.args= application.title=PerformanceTestFoldersData application.vendor=tester diff --git a/performance.java/test/qa-functional/data/PerformanceTestFoldersData/nbproject/project.xml b/performance.java/test/qa-functional/data/PerformanceTestFoldersData/nbproject/project.xml index 3d57cc88b..f5fd7fe51 100644 --- a/performance.java/test/qa-functional/data/PerformanceTestFoldersData/nbproject/project.xml +++ b/performance.java/test/qa-functional/data/PerformanceTestFoldersData/nbproject/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.java.j2seproject</type> <configuration> diff --git a/performance.java/test/qa-functional/data/PerformanceTestFoldersData/src/folders/xmlFolder100/build.xml b/performance.java/test/qa-functional/data/PerformanceTestFoldersData/src/folders/xmlFolder100/build.xml index ae2ab11e0..a25f6ab69 100644 --- a/performance.java/test/qa-functional/data/PerformanceTestFoldersData/src/folders/xmlFolder100/build.xml +++ b/performance.java/test/qa-functional/data/PerformanceTestFoldersData/src/folders/xmlFolder100/build.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- You may freely edit this file. See harness/README in the NetBeans platform --> <!-- for some information on what you could do (e.g. targets to override). --> <!-- If you delete this file and reopen the project it will be recreated. --> diff --git a/performance.java/test/qa-functional/data/SystemProperties/build.xml b/performance.java/test/qa-functional/data/SystemProperties/build.xml index 0e04e8731..3edc962d9 100644 --- a/performance.java/test/qa-functional/data/SystemProperties/build.xml +++ b/performance.java/test/qa-functional/data/SystemProperties/build.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- You may freely edit this file. See harness/README in the NetBeans platform --> <!-- for some information on what you could do (e.g. targets to override). --> <!-- If you delete this file and reopen the project it will be recreated. --> diff --git a/performance.java/test/qa-functional/data/SystemProperties/nbproject/platform.properties b/performance.java/test/qa-functional/data/SystemProperties/nbproject/platform.properties index 108fac5ef..cab50891d 100644 --- a/performance.java/test/qa-functional/data/SystemProperties/nbproject/platform.properties +++ b/performance.java/test/qa-functional/data/SystemProperties/nbproject/platform.properties @@ -1 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# nbplatform.active=default diff --git a/performance.java/test/qa-functional/data/SystemProperties/nbproject/project.properties b/performance.java/test/qa-functional/data/SystemProperties/nbproject/project.properties index e69de29bb..245692337 100644 --- a/performance.java/test/qa-functional/data/SystemProperties/nbproject/project.properties +++ b/performance.java/test/qa-functional/data/SystemProperties/nbproject/project.properties @@ -0,0 +1,17 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + diff --git a/performance.java/test/qa-functional/data/SystemProperties/nbproject/project.xml b/performance.java/test/qa-functional/data/SystemProperties/nbproject/project.xml index 526ae9b26..2f11970c9 100644 --- a/performance.java/test/qa-functional/data/SystemProperties/nbproject/project.xml +++ b/performance.java/test/qa-functional/data/SystemProperties/nbproject/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.apisupport.project</type> <configuration> diff --git a/performance/enterprise/test/qa-functional/data/BPELTestProject/build.xml b/performance/enterprise/test/qa-functional/data/BPELTestProject/build.xml index 98a84dc84..9bdac94f6 100644 --- a/performance/enterprise/test/qa-functional/data/BPELTestProject/build.xml +++ b/performance/enterprise/test/qa-functional/data/BPELTestProject/build.xml @@ -1,21 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - The contents of this file are subject to the terms of the Common Development - and Distribution License (the License). You may not use this file except in - compliance with the License. - - You can obtain a copy of the License at http://www.netbeans.org/cddl.html - or http://www.netbeans.org/cddl.txt. - - When distributing Covered Code, include this CDDL Header Notice in each file - and include the License file at http://www.netbeans.org/cddl.txt. - If applicable, add the following below the CDDL Header, with the fields - enclosed by brackets [] replaced by your own identifying information: - "Portions Copyrighted [year] [name of copyright owner]" - - The Original Software is NetBeans. The Initial Developer of the Original - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun - Microsystems, Inc. All Rights Reserved. + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + --> <project name="" default="default" basedir="." xmlns:web="http://www.netbeans.org/ns/j2ee-ejbjarproject/1"> <description>Builds, tests, and runs the project .</description> diff --git a/performance/enterprise/test/qa-functional/data/BPELTestProject/nbproject/project.properties b/performance/enterprise/test/qa-functional/data/BPELTestProject/nbproject/project.properties index 985dd3d13..f1b49cda1 100644 --- a/performance/enterprise/test/qa-functional/data/BPELTestProject/nbproject/project.properties +++ b/performance/enterprise/test/qa-functional/data/BPELTestProject/nbproject/project.properties @@ -1,21 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# The contents of this file are subject to the terms of the Common Development -# and Distribution License (the License). You may not use this file except in -# compliance with the License. -# -# You can obtain a copy of the License at http://www.netbeans.org/cddl.html -# or http://www.netbeans.org/cddl.txt. -# -# When distributing Covered Code, include this CDDL Header Notice in each file -# and include the License file at http://www.netbeans.org/cddl.txt. -# If applicable, add the following below the CDDL Header, with the fields -# enclosed by brackets [] replaced by your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun -# Microsystems, Inc. All Rights Reserved. +# http://www.apache.org/licenses/LICENSE-2.0 # +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. bcdeployment.jar=${build.dir}/BCDeployment.jar build.classes.dir=${build.dir}/jar diff --git a/performance/enterprise/test/qa-functional/data/BPELTestProject/nbproject/project.xml b/performance/enterprise/test/qa-functional/data/BPELTestProject/nbproject/project.xml index 9bd48d2a4..6380429a2 100644 --- a/performance/enterprise/test/qa-functional/data/BPELTestProject/nbproject/project.xml +++ b/performance/enterprise/test/qa-functional/data/BPELTestProject/nbproject/project.xml @@ -1,21 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - The contents of this file are subject to the terms of the Common Development - and Distribution License (the License). You may not use this file except in - compliance with the License. - - You can obtain a copy of the License at http://www.netbeans.org/cddl.html - or http://www.netbeans.org/cddl.txt. - - When distributing Covered Code, include this CDDL Header Notice in each file - and include the License file at http://www.netbeans.org/cddl.txt. - If applicable, add the following below the CDDL Header, with the fields - enclosed by brackets [] replaced by your own identifying information: - "Portions Copyrighted [year] [name of copyright owner]" - - The Original Software is NetBeans. The Initial Developer of the Original - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun - Microsystems, Inc. All Rights Reserved. + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + --> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.bpel.project</type> diff --git a/performance/enterprise/test/qa-functional/data/TravelReservationService/ReservationPartnerServices/build.xml b/performance/enterprise/test/qa-functional/data/TravelReservationService/ReservationPartnerServices/build.xml index 880140128..7227dcfba 100644 --- a/performance/enterprise/test/qa-functional/data/TravelReservationService/ReservationPartnerServices/build.xml +++ b/performance/enterprise/test/qa-functional/data/TravelReservationService/ReservationPartnerServices/build.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- You may freely edit this file. See commented blocks below for --> <!-- some examples of how to customize the build. --> <!-- (If you delete it and reopen the project it will be recreated.) --> diff --git a/performance/enterprise/test/qa-functional/data/TravelReservationService/ReservationPartnerServices/nbproject/project.properties b/performance/enterprise/test/qa-functional/data/TravelReservationService/ReservationPartnerServices/nbproject/project.properties index f9e926335..6564d2bb6 100644 --- a/performance/enterprise/test/qa-functional/data/TravelReservationService/ReservationPartnerServices/nbproject/project.properties +++ b/performance/enterprise/test/qa-functional/data/TravelReservationService/ReservationPartnerServices/nbproject/project.properties @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + annotation.processing.enabled=false annotation.processing.enabled.in.editor=false annotation.processing.processors.list= diff --git a/performance/enterprise/test/qa-functional/data/TravelReservationService/ReservationPartnerServices/nbproject/project.xml b/performance/enterprise/test/qa-functional/data/TravelReservationService/ReservationPartnerServices/nbproject/project.xml index bd1452cca..8a4f178a6 100644 --- a/performance/enterprise/test/qa-functional/data/TravelReservationService/ReservationPartnerServices/nbproject/project.xml +++ b/performance/enterprise/test/qa-functional/data/TravelReservationService/ReservationPartnerServices/nbproject/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.j2ee.ejbjarproject</type> <configuration> diff --git a/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationService/build.xml b/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationService/build.xml index 912fb108c..4277a97d5 100644 --- a/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationService/build.xml +++ b/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationService/build.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- You may freely edit this file. See commented blocks below for --> <!-- some examples of how to customize the build. --> <!-- (If you delete it and reopen the project it will be recreated.) --> diff --git a/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationService/nbproject/project.properties b/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationService/nbproject/project.properties index 6571b9499..176764f78 100644 --- a/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationService/nbproject/project.properties +++ b/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationService/nbproject/project.properties @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + allow.build.with.error=false bcdeployment.jar=${build.dir}/BCDeployment.jar build.classes.dir=${build.dir}/jar diff --git a/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationService/nbproject/project.xml b/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationService/nbproject/project.xml index 0818681b9..cc9a712df 100644 --- a/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationService/nbproject/project.xml +++ b/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationService/nbproject/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.bpel.project</type> <configuration> diff --git a/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/build.xml b/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/build.xml index 41ddf53c3..d29b046f9 100644 --- a/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/build.xml +++ b/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/build.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- You may freely edit this file. See commented blocks below for --> <!-- some examples of how to customize the build. --> <!-- (If you delete it and reopen the project it will be recreated.) --> diff --git a/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/nbproject/project.properties b/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/nbproject/project.properties index 15a8a00aa..7af8230b2 100644 --- a/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/nbproject/project.properties +++ b/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/nbproject/project.properties @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + build.classes.dir=${build.dir}/jar build.classes.excludes=**/*.java,**/*.form,**/.nbattrs build.dir=build diff --git a/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/nbproject/project.xml b/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/nbproject/project.xml index 406fa4a96..2c690057b 100644 --- a/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/nbproject/project.xml +++ b/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/nbproject/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.compapp.projects.jbi</type> <configuration> diff --git a/performance/mobility/test/qa-functional/data/MobileApplicationSwitchConfiguration/build.xml b/performance/mobility/test/qa-functional/data/MobileApplicationSwitchConfiguration/build.xml index 57e438ff8..84cb6f692 100644 --- a/performance/mobility/test/qa-functional/data/MobileApplicationSwitchConfiguration/build.xml +++ b/performance/mobility/test/qa-functional/data/MobileApplicationSwitchConfiguration/build.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- You may freely edit this file. See commented blocks below for --> <!-- some examples of how to customize the build. --> <!-- (If you delete it and reopen the project it will be recreated.) --> diff --git a/performance/mobility/test/qa-functional/data/MobileApplicationSwitchConfiguration/nbproject/project.properties b/performance/mobility/test/qa-functional/data/MobileApplicationSwitchConfiguration/nbproject/project.properties index a4e4f2960..f127b6de1 100644 --- a/performance/mobility/test/qa-functional/data/MobileApplicationSwitchConfiguration/nbproject/project.properties +++ b/performance/mobility/test/qa-functional/data/MobileApplicationSwitchConfiguration/nbproject/project.properties @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + abilities=MMAPI=1.1,CLDC=1.1,ColorScreen,JSR82=1.0,JSR184=1.0,ScreenHeight=320,ScreenColorDepth=8,WMA=2.0,ScreenWidth=240,JSR172=1.0,MIDP=2.0,JSR75=1.0, all.configurations=\ ,NotDefaultConfiguration application.args= diff --git a/performance/mobility/test/qa-functional/data/MobileApplicationSwitchConfiguration/nbproject/project.xml b/performance/mobility/test/qa-functional/data/MobileApplicationSwitchConfiguration/nbproject/project.xml index fe082e8a2..220543d8f 100644 --- a/performance/mobility/test/qa-functional/data/MobileApplicationSwitchConfiguration/nbproject/project.xml +++ b/performance/mobility/test/qa-functional/data/MobileApplicationSwitchConfiguration/nbproject/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.kjava.j2meproject</type> <configuration> diff --git a/performance/mobility/test/qa-functional/data/MobileApplicationVisualMIDlet/build.xml b/performance/mobility/test/qa-functional/data/MobileApplicationVisualMIDlet/build.xml index e29d7b0a4..068843ffc 100644 --- a/performance/mobility/test/qa-functional/data/MobileApplicationVisualMIDlet/build.xml +++ b/performance/mobility/test/qa-functional/data/MobileApplicationVisualMIDlet/build.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- You may freely edit this file. See commented blocks below for --> <!-- some examples of how to customize the build. --> <!-- (If you delete it and reopen the project it will be recreated.) --> diff --git a/performance/mobility/test/qa-functional/data/MobileApplicationVisualMIDlet/nbproject/project.properties b/performance/mobility/test/qa-functional/data/MobileApplicationVisualMIDlet/nbproject/project.properties index bb8d7ed2b..e88621442 100644 --- a/performance/mobility/test/qa-functional/data/MobileApplicationVisualMIDlet/nbproject/project.properties +++ b/performance/mobility/test/qa-functional/data/MobileApplicationVisualMIDlet/nbproject/project.properties @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + abilities=MMAPI=1.1,CLDC=1.1,ColorScreen,JSR82=1.0,JSR184=1.0,ScreenHeight=320,ScreenColorDepth=8,WMA=2.0,ScreenWidth=240,JSR172=1.0,MIDP=2.0,JSR75=1.0, all.configurations=\ application.args= diff --git a/performance/mobility/test/qa-functional/data/MobileApplicationVisualMIDlet/nbproject/project.xml b/performance/mobility/test/qa-functional/data/MobileApplicationVisualMIDlet/nbproject/project.xml index e5bece200..758943463 100644 --- a/performance/mobility/test/qa-functional/data/MobileApplicationVisualMIDlet/nbproject/project.xml +++ b/performance/mobility/test/qa-functional/data/MobileApplicationVisualMIDlet/nbproject/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.kjava.j2meproject</type> <configuration> diff --git a/profiler.j2se/test/unit/data/JavaApp/build.xml b/profiler.j2se/test/unit/data/JavaApp/build.xml index d7f3d7c3b..b3fb4819a 100644 --- a/profiler.j2se/test/unit/data/JavaApp/build.xml +++ b/profiler.j2se/test/unit/data/JavaApp/build.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- You may freely edit this file. See commented blocks below for --> <!-- some examples of how to customize the build. --> <!-- (If you delete it and reopen the project it will be recreated.) --> diff --git a/profiler.j2se/test/unit/data/JavaApp/nbproject/project.properties b/profiler.j2se/test/unit/data/JavaApp/nbproject/project.properties index 2b515aefb..b005f38ab 100644 --- a/profiler.j2se/test/unit/data/JavaApp/nbproject/project.properties +++ b/profiler.j2se/test/unit/data/JavaApp/nbproject/project.properties @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + build.classes.dir=${build.dir}/classes build.classes.excludes=**/*.java,**/*.form # This directory is removed when the project is cleaned: diff --git a/profiler.j2se/test/unit/data/JavaApp/nbproject/project.xml b/profiler.j2se/test/unit/data/JavaApp/nbproject/project.xml index 63c24754b..214d73868 100644 --- a/profiler.j2se/test/unit/data/JavaApp/nbproject/project.xml +++ b/profiler.j2se/test/unit/data/JavaApp/nbproject/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.java.j2seproject</type> <configuration> diff --git a/profiler.nbimpl/test/unit/data/JavaApp/build.xml b/profiler.nbimpl/test/unit/data/JavaApp/build.xml index d7f3d7c3b..b3fb4819a 100644 --- a/profiler.nbimpl/test/unit/data/JavaApp/build.xml +++ b/profiler.nbimpl/test/unit/data/JavaApp/build.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- You may freely edit this file. See commented blocks below for --> <!-- some examples of how to customize the build. --> <!-- (If you delete it and reopen the project it will be recreated.) --> diff --git a/profiler.nbimpl/test/unit/data/JavaApp/nbproject/project.properties b/profiler.nbimpl/test/unit/data/JavaApp/nbproject/project.properties index 36e86e72a..2ccb2f6ea 100644 --- a/profiler.nbimpl/test/unit/data/JavaApp/nbproject/project.properties +++ b/profiler.nbimpl/test/unit/data/JavaApp/nbproject/project.properties @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + build.classes.dir=${build.dir}/classes build.classes.excludes=**/*.java,**/*.form # This directory is removed when the project is cleaned: diff --git a/profiler.nbimpl/test/unit/data/JavaApp/nbproject/project.xml b/profiler.nbimpl/test/unit/data/JavaApp/nbproject/project.xml index 63c24754b..214d73868 100644 --- a/profiler.nbimpl/test/unit/data/JavaApp/nbproject/project.xml +++ b/profiler.nbimpl/test/unit/data/JavaApp/nbproject/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.java.j2seproject</type> <configuration> diff --git a/profiler/l10n.list b/profiler/l10n.list index b91ae6d4c..065d75583 100644 --- a/profiler/l10n.list +++ b/profiler/l10n.list @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# # profiler/modules/main read global ${l10n-module}/src/org/netbeans/modules/profiler/heapwalk/oqlqueries-default.xml diff --git a/project.ant/test/unit/src/org/netbeans/spi/project/support/ant/data/project.properties b/project.ant/test/unit/src/org/netbeans/spi/project/support/ant/data/project.properties index 7bba10468..bd835b2ee 100644 --- a/project.ant/test/unit/src/org/netbeans/spi/project/support/ant/data/project.properties +++ b/project.ant/test/unit/src/org/netbeans/spi/project/support/ant/data/project.properties @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + shared.prop=value1 overridden.prop=value3 derived.prop=${private.prop}:${shared.prop}:${undefined.prop} diff --git a/project.ant/test/unit/src/org/netbeans/spi/project/support/ant/data/project.xml b/project.ant/test/unit/src/org/netbeans/spi/project/support/ant/data/project.xml index 2d29e4231..ed590eb29 100644 --- a/project.ant/test/unit/src/org/netbeans/spi/project/support/ant/data/project.xml +++ b/project.ant/test/unit/src/org/netbeans/spi/project/support/ant/data/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>test</type> <configuration> diff --git a/projectimport.eclipse.core/test/createWorkspace.sh b/projectimport.eclipse.core/test/createWorkspace.sh index 3589dab45..e697cc984 100644 --- a/projectimport.eclipse.core/test/createWorkspace.sh +++ b/projectimport.eclipse.core/test/createWorkspace.sh @@ -1,45 +1,22 @@ #!/bin/bash -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Copyright 2013 Oracle and/or its affiliates. All rights reserved. -# -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. -# -# Contributor(s): -# -# Portions Copyrighted 2012 Sun Microsystems, Inc. +# http://www.apache.org/licenses/LICENSE-2.0 # +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + # Script: createWorkspace.sh # # Convenient script for generating workspace with metadata we needs for tests. diff --git a/properties/l10n.list b/properties/l10n.list index 731e29493..a7b982b11 100644 --- a/properties/l10n.list +++ b/properties/l10n.list @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# # properties read global ${l10n-module}/src/org/netbeans/modules/properties/*.gif diff --git a/properties/test/qa-functional/data/projects/properties_test/build.xml b/properties/test/qa-functional/data/projects/properties_test/build.xml index 0dab3c9f3..180c253ab 100644 --- a/properties/test/qa-functional/data/projects/properties_test/build.xml +++ b/properties/test/qa-functional/data/projects/properties_test/build.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- You may freely edit this file. See commented blocks below for --> <!-- some examples of how to customize the build. --> <!-- (If you delete it and reopen the project it will be recreated.) --> diff --git a/properties/test/qa-functional/data/projects/properties_test/nbproject/project.properties b/properties/test/qa-functional/data/projects/properties_test/nbproject/project.properties index 4c9e42d35..3a81924fe 100644 --- a/properties/test/qa-functional/data/projects/properties_test/nbproject/project.properties +++ b/properties/test/qa-functional/data/projects/properties_test/nbproject/project.properties @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + application.args= build.classes.dir=${build.dir}/classes build.classes.excludes=**/*.java,**/*.form diff --git a/properties/test/qa-functional/data/projects/properties_test/nbproject/project.xml b/properties/test/qa-functional/data/projects/properties_test/nbproject/project.xml index e6232046b..2e21aa960 100644 --- a/properties/test/qa-functional/data/projects/properties_test/nbproject/project.xml +++ b/properties/test/qa-functional/data/projects/properties_test/nbproject/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.java.j2seproject</type> <configuration> diff --git a/properties/test/qa-functional/data/projects/properties_test2/build.xml b/properties/test/qa-functional/data/projects/properties_test2/build.xml index 5a030a1c9..4a2b2b2d5 100644 --- a/properties/test/qa-functional/data/projects/properties_test2/build.xml +++ b/properties/test/qa-functional/data/projects/properties_test2/build.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- You may freely edit this file. See commented blocks below for --> <!-- some examples of how to customize the build. --> <!-- (If you delete it and reopen the project it will be recreated.) --> diff --git a/properties/test/qa-functional/data/projects/properties_test2/nbproject/project.properties b/properties/test/qa-functional/data/projects/properties_test2/nbproject/project.properties index f9305d4b6..6a2c89135 100644 --- a/properties/test/qa-functional/data/projects/properties_test2/nbproject/project.properties +++ b/properties/test/qa-functional/data/projects/properties_test2/nbproject/project.properties @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + application.args= build.classes.dir=${build.dir}/classes build.classes.excludes=**/*.java,**/*.form diff --git a/properties/test/qa-functional/data/projects/properties_test2/nbproject/project.xml b/properties/test/qa-functional/data/projects/properties_test2/nbproject/project.xml index 8ef3069e1..acc7295cb 100644 --- a/properties/test/qa-functional/data/projects/properties_test2/nbproject/project.xml +++ b/properties/test/qa-functional/data/projects/properties_test2/nbproject/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.java.j2seproject</type> <configuration> diff --git a/refactoring.api/src/META-INF/netbeans/translate.names b/refactoring.api/src/META-INF/netbeans/translate.names index 7a713d126..fa04ed049 100644 --- a/refactoring.api/src/META-INF/netbeans/translate.names +++ b/refactoring.api/src/META-INF/netbeans/translate.names @@ -1,39 +1,17 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved. +# http://www.apache.org/licenses/LICENSE-2.0 # -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. -# -# Contributor(s): -# Changed filename of actions +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. Actions/Refactoring/RefactoringWhereUsed.instance=Actions/Refactoring/org-netbeans-modules-refactoring-api-ui-WhereUsedAction.instance diff --git a/refactoring.java/test/qa-functional/data/projects/RefactoringTest/build.xml b/refactoring.java/test/qa-functional/data/projects/RefactoringTest/build.xml index 4e7470555..2ab9db089 100644 --- a/refactoring.java/test/qa-functional/data/projects/RefactoringTest/build.xml +++ b/refactoring.java/test/qa-functional/data/projects/RefactoringTest/build.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- You may freely edit this file. See commented blocks below for --> <!-- some examples of how to customize the build. --> <!-- (If you delete it and reopen the project it will be recreated.) --> diff --git a/refactoring.java/test/qa-functional/data/projects/RefactoringTest/nbproject/project.properties b/refactoring.java/test/qa-functional/data/projects/RefactoringTest/nbproject/project.properties index 37ac6e89f..1295d7d19 100644 --- a/refactoring.java/test/qa-functional/data/projects/RefactoringTest/nbproject/project.properties +++ b/refactoring.java/test/qa-functional/data/projects/RefactoringTest/nbproject/project.properties @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + annotation.processing.enabled=true annotation.processing.enabled.in.editor=false annotation.processing.processors.list= diff --git a/refactoring.java/test/qa-functional/data/projects/RefactoringTest/nbproject/project.xml b/refactoring.java/test/qa-functional/data/projects/RefactoringTest/nbproject/project.xml index e48e006e7..db1681ae2 100644 --- a/refactoring.java/test/qa-functional/data/projects/RefactoringTest/nbproject/project.xml +++ b/refactoring.java/test/qa-functional/data/projects/RefactoringTest/nbproject/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.java.j2seproject</type> <configuration> diff --git a/refactoring.java/test/unit/data/SimpleJ2SEApp/build.xml b/refactoring.java/test/unit/data/SimpleJ2SEApp/build.xml index 418aa6700..933b4da2c 100644 --- a/refactoring.java/test/unit/data/SimpleJ2SEApp/build.xml +++ b/refactoring.java/test/unit/data/SimpleJ2SEApp/build.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- You may freely edit this file. See commented blocks below for --> <!-- some examples of how to customize the build. --> <!-- (If you delete it and reopen the project it will be recreated.) --> diff --git a/refactoring.java/test/unit/data/SimpleJ2SEApp/nbproject/project.properties b/refactoring.java/test/unit/data/SimpleJ2SEApp/nbproject/project.properties index 605674c10..dfcbca9fb 100644 --- a/refactoring.java/test/unit/data/SimpleJ2SEApp/nbproject/project.properties +++ b/refactoring.java/test/unit/data/SimpleJ2SEApp/nbproject/project.properties @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + build.classes.dir=${build.dir}/classes build.classes.excludes=**/*.java,**/*.form # This directory is removed when the project is cleaned: diff --git a/refactoring.java/test/unit/data/SimpleJ2SEApp/nbproject/project.xml b/refactoring.java/test/unit/data/SimpleJ2SEApp/nbproject/project.xml index db90815b1..835bb1d62 100644 --- a/refactoring.java/test/unit/data/SimpleJ2SEApp/nbproject/project.xml +++ b/refactoring.java/test/unit/data/SimpleJ2SEApp/nbproject/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.java.j2seproject</type> <configuration> diff --git a/refactoring.java/test/unit/data/SimpleJ2SEAppChild/build.xml b/refactoring.java/test/unit/data/SimpleJ2SEAppChild/build.xml index 5c564e1e8..fbd77f641 100644 --- a/refactoring.java/test/unit/data/SimpleJ2SEAppChild/build.xml +++ b/refactoring.java/test/unit/data/SimpleJ2SEAppChild/build.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- You may freely edit this file. See commented blocks below for --> <!-- some examples of how to customize the build. --> <!-- (If you delete it and reopen the project it will be recreated.) --> diff --git a/refactoring.java/test/unit/data/SimpleJ2SEAppChild/nbproject/project.properties b/refactoring.java/test/unit/data/SimpleJ2SEAppChild/nbproject/project.properties index 05fe48036..98b2fe5ee 100644 --- a/refactoring.java/test/unit/data/SimpleJ2SEAppChild/nbproject/project.properties +++ b/refactoring.java/test/unit/data/SimpleJ2SEAppChild/nbproject/project.properties @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + annotation.processing.enabled=true annotation.processing.enabled.in.editor=false annotation.processing.processor.options= diff --git a/refactoring.java/test/unit/data/SimpleJ2SEAppChild/nbproject/project.xml b/refactoring.java/test/unit/data/SimpleJ2SEAppChild/nbproject/project.xml index c696877c4..1057d4567 100644 --- a/refactoring.java/test/unit/data/SimpleJ2SEAppChild/nbproject/project.xml +++ b/refactoring.java/test/unit/data/SimpleJ2SEAppChild/nbproject/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.java.j2seproject</type> <configuration> diff --git a/spellchecker.bindings.htmlxml/src/org/netbeans/modules/spellchecker/bindings/htmlxml/HtmlXmlTokenListProvider.java b/spellchecker.bindings.htmlxml/src/org/netbeans/modules/spellchecker/bindings/htmlxml/HtmlXmlTokenListProvider.java index 357a53df2..9ae3e8d1b 100644 --- a/spellchecker.bindings.htmlxml/src/org/netbeans/modules/spellchecker/bindings/htmlxml/HtmlXmlTokenListProvider.java +++ b/spellchecker.bindings.htmlxml/src/org/netbeans/modules/spellchecker/bindings/htmlxml/HtmlXmlTokenListProvider.java @@ -1,36 +1,20 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * Contributor(s): + * http://www.apache.org/licenses/LICENSE-2.0 * - * The Original Software is NetBeans. The Initial Developer of the Original - * Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun - * Microsystems, Inc. All Rights Reserved. - * - * Portions Copyrighted 2007-2008 Stefan Riha, Roland Poppenreiter + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.netbeans.modules.spellchecker.bindings.htmlxml; diff --git a/spellchecker.bindings.properties/src/org/netbeans/modules/spellchecker/bindings/properties/PropertiesTokenListProvider.java b/spellchecker.bindings.properties/src/org/netbeans/modules/spellchecker/bindings/properties/PropertiesTokenListProvider.java index 2220f85e5..336a18122 100644 --- a/spellchecker.bindings.properties/src/org/netbeans/modules/spellchecker/bindings/properties/PropertiesTokenListProvider.java +++ b/spellchecker.bindings.properties/src/org/netbeans/modules/spellchecker/bindings/properties/PropertiesTokenListProvider.java @@ -1,47 +1,20 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * Contributor(s): +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * The Original Software is NetBeans. The Initial Developer of the Original - * Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun - * Microsystems, Inc. All Rights Reserved. - * - * Portions Copyrighted 2007-2008 Stefan Riha, Roland Poppenreiter + * http://www.apache.org/licenses/LICENSE-2.0 * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.netbeans.modules.spellchecker.bindings.properties; diff --git a/spi.debugger.ui/l10n.list b/spi.debugger.ui/l10n.list index ba422cb61..ef35b8936 100644 --- a/spi.debugger.ui/l10n.list +++ b/spi.debugger.ui/l10n.list @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + # apisupport/samples read global ${l10n-module}/src/**/*.gif diff --git a/spi.debugger.ui/src/META-INF/debugger/BreakpointsView/org.netbeans.spi.viewmodel.ColumnModel b/spi.debugger.ui/src/META-INF/debugger/BreakpointsView/org.netbeans.spi.viewmodel.ColumnModel index ffc14989b..1bc17912d 100644 --- a/spi.debugger.ui/src/META-INF/debugger/BreakpointsView/org.netbeans.spi.viewmodel.ColumnModel +++ b/spi.debugger.ui/src/META-INF/debugger/BreakpointsView/org.netbeans.spi.viewmodel.ColumnModel @@ -1,42 +1,18 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. -# -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Contributor(s): +# http://www.apache.org/licenses/LICENSE-2.0 # -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + org.netbeans.modules.debugger.ui.models.ColumnModels.createDefaultBreakpointsColumn() diff --git a/spi.debugger.ui/src/META-INF/debugger/BreakpointsView/org.netbeans.spi.viewmodel.NodeActionsProvider b/spi.debugger.ui/src/META-INF/debugger/BreakpointsView/org.netbeans.spi.viewmodel.NodeActionsProvider index 773ff5c64..9b764acb2 100644 --- a/spi.debugger.ui/src/META-INF/debugger/BreakpointsView/org.netbeans.spi.viewmodel.NodeActionsProvider +++ b/spi.debugger.ui/src/META-INF/debugger/BreakpointsView/org.netbeans.spi.viewmodel.NodeActionsProvider @@ -1,42 +1,18 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. -# -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Contributor(s): +# http://www.apache.org/licenses/LICENSE-2.0 # -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + org.netbeans.modules.debugger.ui.models.BreakpointsActionsProvider diff --git a/spi.debugger.ui/src/META-INF/debugger/BreakpointsView/org.netbeans.spi.viewmodel.NodeModel b/spi.debugger.ui/src/META-INF/debugger/BreakpointsView/org.netbeans.spi.viewmodel.NodeModel index 08ec61dd1..f20a3a33a 100644 --- a/spi.debugger.ui/src/META-INF/debugger/BreakpointsView/org.netbeans.spi.viewmodel.NodeModel +++ b/spi.debugger.ui/src/META-INF/debugger/BreakpointsView/org.netbeans.spi.viewmodel.NodeModel @@ -1,42 +1,18 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. -# -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Contributor(s): +# http://www.apache.org/licenses/LICENSE-2.0 # -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. -org.netbeans.modules.debugger.ui.models.BreakpointsNodeModel \ No newline at end of file +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +org.netbeans.modules.debugger.ui.models.BreakpointsNodeModel diff --git a/spi.debugger.ui/src/META-INF/debugger/BreakpointsView/org.netbeans.spi.viewmodel.TreeExpansionModelFilter b/spi.debugger.ui/src/META-INF/debugger/BreakpointsView/org.netbeans.spi.viewmodel.TreeExpansionModelFilter index 3d1a66390..38589c352 100644 --- a/spi.debugger.ui/src/META-INF/debugger/BreakpointsView/org.netbeans.spi.viewmodel.TreeExpansionModelFilter +++ b/spi.debugger.ui/src/META-INF/debugger/BreakpointsView/org.netbeans.spi.viewmodel.TreeExpansionModelFilter @@ -1,42 +1,18 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. -# -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Contributor(s): +# http://www.apache.org/licenses/LICENSE-2.0 # -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + org.netbeans.modules.debugger.ui.models.BreakpointsGroupExpansionFilter diff --git a/spi.debugger.ui/src/META-INF/debugger/BreakpointsView/org.netbeans.spi.viewmodel.TreeModel b/spi.debugger.ui/src/META-INF/debugger/BreakpointsView/org.netbeans.spi.viewmodel.TreeModel index 8a70168bc..b56d0652b 100644 --- a/spi.debugger.ui/src/META-INF/debugger/BreakpointsView/org.netbeans.spi.viewmodel.TreeModel +++ b/spi.debugger.ui/src/META-INF/debugger/BreakpointsView/org.netbeans.spi.viewmodel.TreeModel @@ -1,42 +1,18 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. -# -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Contributor(s): +# http://www.apache.org/licenses/LICENSE-2.0 # -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + org.netbeans.modules.debugger.ui.models.BreakpointsTreeModel diff --git a/spi.debugger.ui/src/META-INF/debugger/CallStackView/org.netbeans.spi.viewmodel.ColumnModel b/spi.debugger.ui/src/META-INF/debugger/CallStackView/org.netbeans.spi.viewmodel.ColumnModel index 72d27391c..02cea92a7 100644 --- a/spi.debugger.ui/src/META-INF/debugger/CallStackView/org.netbeans.spi.viewmodel.ColumnModel +++ b/spi.debugger.ui/src/META-INF/debugger/CallStackView/org.netbeans.spi.viewmodel.ColumnModel @@ -1,43 +1,19 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. -# -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Contributor(s): +# http://www.apache.org/licenses/LICENSE-2.0 # -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + org.netbeans.modules.debugger.ui.models.ColumnModels.createCallStackLocationColumn() org.netbeans.modules.debugger.ui.models.ColumnModels.createDefaultCallStackColumn() diff --git a/spi.debugger.ui/src/META-INF/debugger/LocalsView/org.netbeans.spi.viewmodel.ColumnModel b/spi.debugger.ui/src/META-INF/debugger/LocalsView/org.netbeans.spi.viewmodel.ColumnModel index be6c37376..0696e6a31 100644 --- a/spi.debugger.ui/src/META-INF/debugger/LocalsView/org.netbeans.spi.viewmodel.ColumnModel +++ b/spi.debugger.ui/src/META-INF/debugger/LocalsView/org.netbeans.spi.viewmodel.ColumnModel @@ -1,44 +1,20 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. -# -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Contributor(s): +# http://www.apache.org/licenses/LICENSE-2.0 # -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + org.netbeans.modules.debugger.ui.models.ColumnModels.createLocalsTypeColumn() org.netbeans.modules.debugger.ui.models.ColumnModels.createLocalsValueColumn() org.netbeans.modules.debugger.ui.models.ColumnModels.createLocalsToStringColumn() diff --git a/spi.debugger.ui/src/META-INF/debugger/LocalsView/org.netbeans.spi.viewmodel.NodeActionsProvider b/spi.debugger.ui/src/META-INF/debugger/LocalsView/org.netbeans.spi.viewmodel.NodeActionsProvider index 586359495..0ed1f345a 100644 --- a/spi.debugger.ui/src/META-INF/debugger/LocalsView/org.netbeans.spi.viewmodel.NodeActionsProvider +++ b/spi.debugger.ui/src/META-INF/debugger/LocalsView/org.netbeans.spi.viewmodel.NodeActionsProvider @@ -1,42 +1,18 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. -# -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Contributor(s): +# http://www.apache.org/licenses/LICENSE-2.0 # -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + org.netbeans.modules.debugger.ui.models.VariablesActionsProvider diff --git a/spi.debugger.ui/src/META-INF/debugger/ResultsView/org.netbeans.spi.viewmodel.ColumnModel b/spi.debugger.ui/src/META-INF/debugger/ResultsView/org.netbeans.spi.viewmodel.ColumnModel index be6c37376..0696e6a31 100644 --- a/spi.debugger.ui/src/META-INF/debugger/ResultsView/org.netbeans.spi.viewmodel.ColumnModel +++ b/spi.debugger.ui/src/META-INF/debugger/ResultsView/org.netbeans.spi.viewmodel.ColumnModel @@ -1,44 +1,20 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. -# -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Contributor(s): +# http://www.apache.org/licenses/LICENSE-2.0 # -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + org.netbeans.modules.debugger.ui.models.ColumnModels.createLocalsTypeColumn() org.netbeans.modules.debugger.ui.models.ColumnModels.createLocalsValueColumn() org.netbeans.modules.debugger.ui.models.ColumnModels.createLocalsToStringColumn() diff --git a/spi.debugger.ui/src/META-INF/debugger/SessionsView/org.netbeans.spi.viewmodel.ColumnModel b/spi.debugger.ui/src/META-INF/debugger/SessionsView/org.netbeans.spi.viewmodel.ColumnModel index 504de452a..565ba96d8 100644 --- a/spi.debugger.ui/src/META-INF/debugger/SessionsView/org.netbeans.spi.viewmodel.ColumnModel +++ b/spi.debugger.ui/src/META-INF/debugger/SessionsView/org.netbeans.spi.viewmodel.ColumnModel @@ -1,44 +1,20 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. -# -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Contributor(s): +# http://www.apache.org/licenses/LICENSE-2.0 # -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + org.netbeans.modules.debugger.ui.models.ColumnModels.createSessionStateColumn() org.netbeans.modules.debugger.ui.models.ColumnModels.createSessionLanguageColumn() org.netbeans.modules.debugger.ui.models.ColumnModels.createSessionHostNameColumn() diff --git a/spi.debugger.ui/src/META-INF/debugger/SessionsView/org.netbeans.spi.viewmodel.NodeActionsProvider b/spi.debugger.ui/src/META-INF/debugger/SessionsView/org.netbeans.spi.viewmodel.NodeActionsProvider index ce72f9e0c..6b33a01a0 100644 --- a/spi.debugger.ui/src/META-INF/debugger/SessionsView/org.netbeans.spi.viewmodel.NodeActionsProvider +++ b/spi.debugger.ui/src/META-INF/debugger/SessionsView/org.netbeans.spi.viewmodel.NodeActionsProvider @@ -1,42 +1,18 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. -# -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Contributor(s): +# http://www.apache.org/licenses/LICENSE-2.0 # -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + org.netbeans.modules.debugger.ui.models.SessionsActionsProvider diff --git a/spi.debugger.ui/src/META-INF/debugger/SessionsView/org.netbeans.spi.viewmodel.NodeModel b/spi.debugger.ui/src/META-INF/debugger/SessionsView/org.netbeans.spi.viewmodel.NodeModel index e6be79df1..3e1fc3e0c 100644 --- a/spi.debugger.ui/src/META-INF/debugger/SessionsView/org.netbeans.spi.viewmodel.NodeModel +++ b/spi.debugger.ui/src/META-INF/debugger/SessionsView/org.netbeans.spi.viewmodel.NodeModel @@ -1,42 +1,18 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. -# -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Contributor(s): +# http://www.apache.org/licenses/LICENSE-2.0 # -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. -org.netbeans.modules.debugger.ui.models.SesionsNodeModel \ No newline at end of file +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +org.netbeans.modules.debugger.ui.models.SesionsNodeModel diff --git a/spi.debugger.ui/src/META-INF/debugger/SessionsView/org.netbeans.spi.viewmodel.TableModel b/spi.debugger.ui/src/META-INF/debugger/SessionsView/org.netbeans.spi.viewmodel.TableModel index e406a00a0..3c6b38d3e 100644 --- a/spi.debugger.ui/src/META-INF/debugger/SessionsView/org.netbeans.spi.viewmodel.TableModel +++ b/spi.debugger.ui/src/META-INF/debugger/SessionsView/org.netbeans.spi.viewmodel.TableModel @@ -1,42 +1,18 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. -# -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Contributor(s): +# http://www.apache.org/licenses/LICENSE-2.0 # -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. -org.netbeans.modules.debugger.ui.models.SessionsTableModel \ No newline at end of file +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +org.netbeans.modules.debugger.ui.models.SessionsTableModel diff --git a/spi.debugger.ui/src/META-INF/debugger/SessionsView/org.netbeans.spi.viewmodel.TreeModel b/spi.debugger.ui/src/META-INF/debugger/SessionsView/org.netbeans.spi.viewmodel.TreeModel index c4752e680..2679687c2 100644 --- a/spi.debugger.ui/src/META-INF/debugger/SessionsView/org.netbeans.spi.viewmodel.TreeModel +++ b/spi.debugger.ui/src/META-INF/debugger/SessionsView/org.netbeans.spi.viewmodel.TreeModel @@ -1,42 +1,18 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. -# -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Contributor(s): +# http://www.apache.org/licenses/LICENSE-2.0 # -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + org.netbeans.modules.debugger.ui.models.SessionsTreeModel diff --git a/spi.debugger.ui/src/META-INF/debugger/ThreadsView/org.netbeans.spi.viewmodel.ColumnModel b/spi.debugger.ui/src/META-INF/debugger/ThreadsView/org.netbeans.spi.viewmodel.ColumnModel index fe600cb8f..096dad46b 100644 --- a/spi.debugger.ui/src/META-INF/debugger/ThreadsView/org.netbeans.spi.viewmodel.ColumnModel +++ b/spi.debugger.ui/src/META-INF/debugger/ThreadsView/org.netbeans.spi.viewmodel.ColumnModel @@ -1,44 +1,20 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. -# -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Contributor(s): +# http://www.apache.org/licenses/LICENSE-2.0 # -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + org.netbeans.modules.debugger.ui.models.ColumnModels.createThreadStateColumn() org.netbeans.modules.debugger.ui.models.ColumnModels.createThreadSuspendedColumn() org.netbeans.modules.debugger.ui.models.ColumnModels.createDefaultThreadColumn() diff --git a/spi.debugger.ui/src/META-INF/debugger/WatchesView/org.netbeans.spi.viewmodel.ColumnModel b/spi.debugger.ui/src/META-INF/debugger/WatchesView/org.netbeans.spi.viewmodel.ColumnModel index 74ec7ac06..84522a4b9 100644 --- a/spi.debugger.ui/src/META-INF/debugger/WatchesView/org.netbeans.spi.viewmodel.ColumnModel +++ b/spi.debugger.ui/src/META-INF/debugger/WatchesView/org.netbeans.spi.viewmodel.ColumnModel @@ -1,44 +1,20 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. -# -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Contributor(s): +# http://www.apache.org/licenses/LICENSE-2.0 # -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + org.netbeans.modules.debugger.ui.models.ColumnModels.createWatchTypeColumn() org.netbeans.modules.debugger.ui.models.ColumnModels.createWatchValueColumn() org.netbeans.modules.debugger.ui.models.ColumnModels.createWatchToStringColumn() diff --git a/spi.debugger.ui/src/META-INF/debugger/WatchesView/org.netbeans.spi.viewmodel.NodeActionsProvider b/spi.debugger.ui/src/META-INF/debugger/WatchesView/org.netbeans.spi.viewmodel.NodeActionsProvider index dc1707828..d21f57b26 100644 --- a/spi.debugger.ui/src/META-INF/debugger/WatchesView/org.netbeans.spi.viewmodel.NodeActionsProvider +++ b/spi.debugger.ui/src/META-INF/debugger/WatchesView/org.netbeans.spi.viewmodel.NodeActionsProvider @@ -1,42 +1,18 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. -# -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Contributor(s): +# http://www.apache.org/licenses/LICENSE-2.0 # -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + org.netbeans.modules.debugger.ui.models.WatchesActionsProvider diff --git a/spi.debugger.ui/src/META-INF/debugger/WatchesView/org.netbeans.spi.viewmodel.NodeModel b/spi.debugger.ui/src/META-INF/debugger/WatchesView/org.netbeans.spi.viewmodel.NodeModel index bab54844d..cf63c3f0a 100644 --- a/spi.debugger.ui/src/META-INF/debugger/WatchesView/org.netbeans.spi.viewmodel.NodeModel +++ b/spi.debugger.ui/src/META-INF/debugger/WatchesView/org.netbeans.spi.viewmodel.NodeModel @@ -1,42 +1,19 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. -# -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Contributor(s): +# http://www.apache.org/licenses/LICENSE-2.0 # -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. -org.netbeans.modules.debugger.ui.models.WatchesNodeModel \ No newline at end of file +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + + +org.netbeans.modules.debugger.ui.models.WatchesNodeModel diff --git a/spi.debugger.ui/src/META-INF/debugger/WatchesView/org.netbeans.spi.viewmodel.TableModel b/spi.debugger.ui/src/META-INF/debugger/WatchesView/org.netbeans.spi.viewmodel.TableModel index d7c977d03..5fd3c9e3f 100644 --- a/spi.debugger.ui/src/META-INF/debugger/WatchesView/org.netbeans.spi.viewmodel.TableModel +++ b/spi.debugger.ui/src/META-INF/debugger/WatchesView/org.netbeans.spi.viewmodel.TableModel @@ -1,42 +1,18 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. -# -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Contributor(s): +# http://www.apache.org/licenses/LICENSE-2.0 # -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. -org.netbeans.modules.debugger.ui.models.WatchesTableModel \ No newline at end of file +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +org.netbeans.modules.debugger.ui.models.WatchesTableModel diff --git a/spi.debugger.ui/src/META-INF/debugger/WatchesView/org.netbeans.spi.viewmodel.TreeModel b/spi.debugger.ui/src/META-INF/debugger/WatchesView/org.netbeans.spi.viewmodel.TreeModel index e6af906a7..44638257c 100644 --- a/spi.debugger.ui/src/META-INF/debugger/WatchesView/org.netbeans.spi.viewmodel.TreeModel +++ b/spi.debugger.ui/src/META-INF/debugger/WatchesView/org.netbeans.spi.viewmodel.TreeModel @@ -1,42 +1,18 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. -# -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Contributor(s): +# http://www.apache.org/licenses/LICENSE-2.0 # -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + org.netbeans.modules.debugger.ui.models.WatchesTreeModel diff --git a/spi.debugger.ui/src/META-INF/debugger/org.netbeans.api.debugger.LazyDebuggerManagerListener b/spi.debugger.ui/src/META-INF/debugger/org.netbeans.api.debugger.LazyDebuggerManagerListener index 1d7176446..8b86c9c6a 100644 --- a/spi.debugger.ui/src/META-INF/debugger/org.netbeans.api.debugger.LazyDebuggerManagerListener +++ b/spi.debugger.ui/src/META-INF/debugger/org.netbeans.api.debugger.LazyDebuggerManagerListener @@ -1,43 +1,19 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. -# -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Contributor(s): +# http://www.apache.org/licenses/LICENSE-2.0 # -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + org.netbeans.modules.debugger.ui.DebuggerManagerListener -org.netbeans.modules.debugger.ui.PersistenceManager \ No newline at end of file +org.netbeans.modules.debugger.ui.PersistenceManager diff --git a/spi.debugger.ui/src/org/netbeans/modules/debugger/resources/evaluator/code_evaluator.wsmode b/spi.debugger.ui/src/org/netbeans/modules/debugger/resources/evaluator/code_evaluator.wsmode index 29505ad27..0130b00e1 100644 --- a/spi.debugger.ui/src/org/netbeans/modules/debugger/resources/evaluator/code_evaluator.wsmode +++ b/spi.debugger.ui/src/org/netbeans/modules/debugger/resources/evaluator/code_evaluator.wsmode @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!DOCTYPE mode PUBLIC "-//NetBeans//DTD Mode Properties 2.0//EN" diff --git a/spi.debugger.ui/test/unit/src/META-INF/debugger/netbeans-TestSession/org.netbeans.api.debugger.LazyActionsManagerListener b/spi.debugger.ui/test/unit/src/META-INF/debugger/netbeans-TestSession/org.netbeans.api.debugger.LazyActionsManagerListener index 2feee3e15..1a288bd64 100644 --- a/spi.debugger.ui/test/unit/src/META-INF/debugger/netbeans-TestSession/org.netbeans.api.debugger.LazyActionsManagerListener +++ b/spi.debugger.ui/test/unit/src/META-INF/debugger/netbeans-TestSession/org.netbeans.api.debugger.LazyActionsManagerListener @@ -1 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + org.netbeans.api.debugger.test.TestLazyActionsManagerListener diff --git a/spi.debugger.ui/test/unit/src/META-INF/debugger/netbeans-TestSession/org.netbeans.api.debugger.test.TestDebugger b/spi.debugger.ui/test/unit/src/META-INF/debugger/netbeans-TestSession/org.netbeans.api.debugger.test.TestDebugger index 1c5c27e9c..582540d53 100644 --- a/spi.debugger.ui/test/unit/src/META-INF/debugger/netbeans-TestSession/org.netbeans.api.debugger.test.TestDebugger +++ b/spi.debugger.ui/test/unit/src/META-INF/debugger/netbeans-TestSession/org.netbeans.api.debugger.test.TestDebugger @@ -1 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + org.netbeans.api.debugger.test.TestDebugger diff --git a/spi.debugger.ui/test/unit/src/META-INF/debugger/netbeans-TestSession/org.netbeans.spi.debugger.ActionsProvider b/spi.debugger.ui/test/unit/src/META-INF/debugger/netbeans-TestSession/org.netbeans.spi.debugger.ActionsProvider index 62253e530..ead314fe3 100644 --- a/spi.debugger.ui/test/unit/src/META-INF/debugger/netbeans-TestSession/org.netbeans.spi.debugger.ActionsProvider +++ b/spi.debugger.ui/test/unit/src/META-INF/debugger/netbeans-TestSession/org.netbeans.spi.debugger.ActionsProvider @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + org.netbeans.api.debugger.test.actions.StartActionProvider org.netbeans.api.debugger.test.actions.KillActionProvider org.netbeans.api.debugger.test.actions.TestDebuggerActionsProvider diff --git a/spi.debugger.ui/test/unit/src/META-INF/debugger/netbeans-TestSession/org.netbeans.spi.debugger.DebuggerEngineProvider b/spi.debugger.ui/test/unit/src/META-INF/debugger/netbeans-TestSession/org.netbeans.spi.debugger.DebuggerEngineProvider index ea1bb5af3..3271fe174 100644 --- a/spi.debugger.ui/test/unit/src/META-INF/debugger/netbeans-TestSession/org.netbeans.spi.debugger.DebuggerEngineProvider +++ b/spi.debugger.ui/test/unit/src/META-INF/debugger/netbeans-TestSession/org.netbeans.spi.debugger.DebuggerEngineProvider @@ -1 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + org.netbeans.api.debugger.test.TestEngineProvider diff --git a/spi.debugger.ui/test/unit/src/META-INF/debugger/netbeans-test-TestDICookie/org.netbeans.spi.debugger.SessionProvider b/spi.debugger.ui/test/unit/src/META-INF/debugger/netbeans-test-TestDICookie/org.netbeans.spi.debugger.SessionProvider index 4059190d0..d5efd9531 100644 --- a/spi.debugger.ui/test/unit/src/META-INF/debugger/netbeans-test-TestDICookie/org.netbeans.spi.debugger.SessionProvider +++ b/spi.debugger.ui/test/unit/src/META-INF/debugger/netbeans-test-TestDICookie/org.netbeans.spi.debugger.SessionProvider @@ -1 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + org.netbeans.api.debugger.test.TestSessionProvider diff --git a/spi.debugger.ui/test/unit/src/META-INF/debugger/org.netbeans.api.debugger.LazyDebuggerManagerListener b/spi.debugger.ui/test/unit/src/META-INF/debugger/org.netbeans.api.debugger.LazyDebuggerManagerListener index 9d79707b3..113ebba69 100644 --- a/spi.debugger.ui/test/unit/src/META-INF/debugger/org.netbeans.api.debugger.LazyDebuggerManagerListener +++ b/spi.debugger.ui/test/unit/src/META-INF/debugger/org.netbeans.api.debugger.LazyDebuggerManagerListener @@ -1 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + org.netbeans.api.debugger.test.TestLazyDebuggerManagerListener diff --git a/spi.debugger.ui/test/unit/src/META-INF/debugger/unittest/annotated/LocalsView/org.netbeans.spi.viewmodel.ColumnModel b/spi.debugger.ui/test/unit/src/META-INF/debugger/unittest/annotated/LocalsView/org.netbeans.spi.viewmodel.ColumnModel index defd190a0..9e702533b 100644 --- a/spi.debugger.ui/test/unit/src/META-INF/debugger/unittest/annotated/LocalsView/org.netbeans.spi.viewmodel.ColumnModel +++ b/spi.debugger.ui/test/unit/src/META-INF/debugger/unittest/annotated/LocalsView/org.netbeans.spi.viewmodel.ColumnModel @@ -1 +1,18 @@ -org.netbeans.api.debugger.providers.TestColumnModelsProvider.createLocalsToStringColumn()-hidden \ No newline at end of file +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +org.netbeans.api.debugger.providers.TestColumnModelsProvider.createLocalsToStringColumn()-hidden diff --git a/spi.debugger.ui/test/unit/src/META-INF/debugger/unittest/org.netbeans.api.debugger.test.TestLookupServiceFirst b/spi.debugger.ui/test/unit/src/META-INF/debugger/unittest/org.netbeans.api.debugger.test.TestLookupServiceFirst index b7e614b71..c10b40f37 100644 --- a/spi.debugger.ui/test/unit/src/META-INF/debugger/unittest/org.netbeans.api.debugger.test.TestLookupServiceFirst +++ b/spi.debugger.ui/test/unit/src/META-INF/debugger/unittest/org.netbeans.api.debugger.test.TestLookupServiceFirst @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + # comment 1 # comment 2 diff --git a/spi.debugger.ui/test/unit/src/META-INF/debugger/unittest/org.netbeans.api.debugger.test.TestLookupServiceInterface b/spi.debugger.ui/test/unit/src/META-INF/debugger/unittest/org.netbeans.api.debugger.test.TestLookupServiceInterface index af36b4492..7c58377ec 100644 --- a/spi.debugger.ui/test/unit/src/META-INF/debugger/unittest/org.netbeans.api.debugger.test.TestLookupServiceInterface +++ b/spi.debugger.ui/test/unit/src/META-INF/debugger/unittest/org.netbeans.api.debugger.test.TestLookupServiceInterface @@ -1 +1,18 @@ -org.netbeans.api.debugger.test.TestLookupServiceSecond \ No newline at end of file +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +org.netbeans.api.debugger.test.TestLookupServiceSecond diff --git a/spi.viewmodel/l10n.list b/spi.viewmodel/l10n.list index ebe66e4b5..b5e3f6e02 100644 --- a/spi.viewmodel/l10n.list +++ b/spi.viewmodel/l10n.list @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# # core/javahelp read global ${l10n-module}/src/**/*.gif diff --git a/subversion/l10n.list b/subversion/l10n.list index 5ce37b371..4421d98e2 100644 --- a/subversion/l10n.list +++ b/subversion/l10n.list @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# # subversion/main read global ${l10n-module}/src/org/netbeans/modules/subversion/ui/browser/wait.gif diff --git a/testng.ant/nbproject/project.properties b/testng.ant/nbproject/project.properties index e967f977e..8aeb9dd55 100644 --- a/testng.ant/nbproject/project.properties +++ b/testng.ant/nbproject/project.properties @@ -1,50 +1,20 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Copyright \u00a9 2011-2012 Oracle and/or its affiliates. All rights reserved. +# http://www.apache.org/licenses/LICENSE-2.0 # -# Oracle and Java are registered trademarks of Oracle and/or its -# affiliates. Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html or -# nbbuild/licenses/CDDL-GPL-2-CP. See the License for the specific -# language governing permissions and limitations under the License. -# When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this particular file -# as subject to the "Classpath" exception as provided by Oracle in the -# GPL Version 2 section of the License file that accompanied this code. If -# applicable, add the following below the License Header, with the fields -# enclosed by brackets [] replaced by your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# Contributor(s): -# -# The original software is NetBeans. The initial developer of the original -# software was Sun Microsystems, Inc.; portions copyright 1997-2006 Sun -# Microsystems, Inc. All rights reserved. -# -# If you wish your version of this file to be governed by only the CDDL or -# only the GPL Version 2, indicate your decision by adding "[Contributor] -# elects to include this software in this distribution under the [CDDL or -# GPL Version 2] license." If you do not indicate a single choice of license, -# a recipient has the option to distribute your version of this file under -# either the CDDL, the GPL Version 2 or to extend the choice of license to -# its licensees as provided above. However, if you add GPL Version 2 code -# and therefore, elected the GPL Version 2 license, then the option applies -# only if the new code is made subject to such option by the copyright holder. -# -# Oracle is not responsible for the availability of third-party Web sites -# mentioned in this document. Oracle does not endorse and is not -# responsible or liable for any content, advertising, products, or other -# materials on or available from such sites or resources. Oracle will not be -# responsible or liable for any damage or loss caused or alleged to be -# caused by or in connection with use of or reliance on any such content, -# goods, or services available on or through any such sites or resources. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + javac.source=1.6 javac.compilerargs=-Xlint -Xlint:-serial nbm.homepage=http://wiki.netbeans.org/TestNG diff --git a/testng.maven/nbproject/project.properties b/testng.maven/nbproject/project.properties index 2eed9234c..91364b9a8 100644 --- a/testng.maven/nbproject/project.properties +++ b/testng.maven/nbproject/project.properties @@ -1,50 +1,20 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Copyright \u00a9 2011-2012 Oracle and/or its affiliates. All rights reserved. +# http://www.apache.org/licenses/LICENSE-2.0 # -# Oracle and Java are registered trademarks of Oracle and/or its -# affiliates. Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html or -# nbbuild/licenses/CDDL-GPL-2-CP. See the License for the specific -# language governing permissions and limitations under the License. -# When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this particular file -# as subject to the "Classpath" exception as provided by Oracle in the -# GPL Version 2 section of the License file that accompanied this code. If -# applicable, add the following below the License Header, with the fields -# enclosed by brackets [] replaced by your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# Contributor(s): -# -# The original software is NetBeans. The initial developer of the original -# software was Sun Microsystems, Inc.; portions copyright 1997-2006 Sun -# Microsystems, Inc. All rights reserved. -# -# If you wish your version of this file to be governed by only the CDDL or -# only the GPL Version 2, indicate your decision by adding "[Contributor] -# elects to include this software in this distribution under the [CDDL or -# GPL Version 2] license." If you do not indicate a single choice of license, -# a recipient has the option to distribute your version of this file under -# either the CDDL, the GPL Version 2 or to extend the choice of license to -# its licensees as provided above. However, if you add GPL Version 2 code -# and therefore, elected the GPL Version 2 license, then the option applies -# only if the new code is made subject to such option by the copyright holder. -# -# Oracle is not responsible for the availability of third-party Web sites -# mentioned in this document. Oracle does not endorse and is not -# responsible or liable for any content, advertising, products, or other -# materials on or available from such sites or resources. Oracle will not be -# responsible or liable for any damage or loss caused or alleged to be -# caused by or in connection with use of or reliance on any such content, -# goods, or services available on or through any such sites or resources. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + javac.source=1.5 javac.compilerargs=-Xlint -Xlint:-serial nbm.homepage=http://wiki.netbeans.org/TestNG diff --git a/testng/nbproject/project.properties b/testng/nbproject/project.properties index 64c18ef69..df4aebfa9 100644 --- a/testng/nbproject/project.properties +++ b/testng/nbproject/project.properties @@ -1,41 +1,20 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Copyright \u00a9 1997-2012 Oracle and/or its affiliates. All rights reserved. +# http://www.apache.org/licenses/LICENSE-2.0 # -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# Contributor(s): -# -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + javac.source=1.5 javac.compilerargs=-Xlint -Xlint:-serial nbm.homepage=http://wiki.netbeans.org/TestNG diff --git a/testng/test/unit/data/projects/tngTestProject/nbproject/project.properties b/testng/test/unit/data/projects/tngTestProject/nbproject/project.properties index 72451cb03..3d2119ec8 100644 --- a/testng/test/unit/data/projects/tngTestProject/nbproject/project.properties +++ b/testng/test/unit/data/projects/tngTestProject/nbproject/project.properties @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + annotation.processing.enabled=true annotation.processing.enabled.in.editor=false annotation.processing.run.all.processors=true diff --git a/uihandler/l10n.list b/uihandler/l10n.list index 3375672ca..a12c13d50 100644 --- a/uihandler/l10n.list +++ b/uihandler/l10n.list @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# # logger/uihandler read global ${l10n-module}/src/org/netbeans/modules/uihandler/Connecting.html diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor.htm index 48721b049..c7dad932a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Using the CSS Source Editor</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor001.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor001.htm index 07bbb1011..b742f03a8 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor001.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor001.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>CSS Source Editor</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor002.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor002.htm index b7ef3039f..25cb44f9f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor002.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor002.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Add CSS Property Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor003.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor003.htm index 7740a2d6d..8e6e8bd40 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor003.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor003.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Edit CSS Rules Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor004.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor004.htm index 48f429324..97876d8f6 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor004.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor004.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>CSS Styles Window</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor005.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor005.htm index 06d5457f0..c815c051a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor005.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor005.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Sass File</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor006.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor006.htm index d91d54975..9ce5623f5 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor006.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor006.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New LESS File</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs.htm index 35e87c87d..ab8159e1f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Using CVS</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs001.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs001.htm index 700d6342e..224af19c9 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs001.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs001.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>CVS Checkout Wizard: CVS Root</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs002.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs002.htm index 9936f1969..ca1a56762 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs002.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs002.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>CVS Checkout Wizard: Module to Checkout</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs003.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs003.htm index effa2f4a3..393af8d11 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs003.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs003.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>CVS Import Wizard: CVS Root</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs004.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs004.htm index c77400a18..4433e3f47 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs004.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs004.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>CVS Import Wizard: Folder to Import</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs005.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs005.htm index 74f0f5a86..01a91ceaf 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs005.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs005.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>CVS: Edit CVS Root Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs006.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs006.htm index 235ef824c..eb8fbca19 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs006.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs006.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>CVS: Browse Modules Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs007.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs007.htm index 648069ce8..720cacca3 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs007.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs007.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>CVS: Browse Tags Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs008.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs008.htm index ed8821b0e..3c8fd8fb9 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs008.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs008.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>CVS: Checkout Complete Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs009.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs009.htm index 6f3cf753b..5275e2a13 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs009.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs009.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>CVS: Versioning Window</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs010.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs010.htm index efcbd08ed..fbe3bbaec 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs010.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs010.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>CVS: Diff Viewer</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs011.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs011.htm index 3b6ef766b..e98460856 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs011.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs011.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>CVS: History Viewer</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs012.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs012.htm index 9f92c55f4..116a9948f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs012.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs012.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>CVS: Merge Conflicts Resolver</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs013.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs013.htm index 928065cf5..df53d7652 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs013.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs013.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>CVS: Versioning Options Window</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs014.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs014.htm index e9d04ff4a..dadb19e3d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs014.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs014.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>CVS: Commit Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs015.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs015.htm index f8c17ad7b..e2bf4f829 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs015.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs015.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>CVS: Branch Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs016.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs016.htm index 1501d6a41..5f820636f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs016.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs016.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>CVS: Switch to Branch Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs017.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs017.htm index a00603ef6..21904ac7a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs017.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs017.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>CVS: Merge Changes from Branch Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs018.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs018.htm index 2f534937f..7f128a82b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs018.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs018.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>CVS: Tag Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs019.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs019.htm index eeb9f4dda..221c850a9 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs019.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs019.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>CVS: Change CVS Root Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs020.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs020.htm index da6eb73ba..48b7753c8 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs020.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs020.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>CVS: View Revision Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database.htm index 04f0afbee..eac62206a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Using Databases</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database001.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database001.htm index 90eda53ae..1cd455213 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database001.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database001.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Adding a JDBC Driver: New Connection Wizard and Add Driver</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database002.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database002.htm index da32b3b24..a841eb79e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database002.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database002.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Connect to Database Dialog</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database003.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database003.htm index 9ea86769d..0633015ae 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database003.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database003.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Connection Wizard: Customize Connection Dialog</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database004.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database004.htm index 710831e4c..89df8c242 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database004.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database004.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Connect to Database Dialog</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database005.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database005.htm index ea27c12f7..ccbe7e647 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database005.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database005.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Connection Wizard: Choose Database Schemas</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database006.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database006.htm index dfe179974..a2704c51a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database006.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database006.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Create Table Dialog</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database007.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database007.htm index 382363687..c87f10846 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database007.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database007.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>SQL History</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database008.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database008.htm index ee9061f57..8391f7d34 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database008.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database008.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>MySQL Server Properties Dialog</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database009.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database009.htm index 96582f2ea..66f529c52 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database009.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database009.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Database Schema Wizard: Database Connection</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database010.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database010.htm index ea2208772..7c8412b0c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database010.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database010.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Database Schema Wizard: Tables and Views</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git.htm index 04bce4eae..4d2e90058 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Using Git</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git001.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git001.htm index b7fbb1ab6..e29cb7337 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git001.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git001.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Git Clone Repository Wizard: Remote Repository</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git002.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git002.htm index 508e24432..364254ccf 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git002.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git002.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Git: Repository Browser</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git003.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git003.htm index bebb00575..7a27c703e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git003.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git003.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Git: Initialize a Git Repository Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git004.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git004.htm index 0b9d26180..4d2eae234 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git004.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git004.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Git Clone Repository Wizard: Remote Branches</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git005.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git005.htm index 483ca4a4f..a66115bf8 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git005.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git005.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Git Clone Repository Wizard: Destination Directory</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git006.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git006.htm index 7e1cc6e85..ee7dee4e4 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git006.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git006.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Git Fetch from Remote Repository Wizard: Remote Repository</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git007.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git007.htm index f85699be5..cd9d5fbc3 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git007.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git007.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Git Fetch from Remote Repository Wizard: Remote Branches</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git008.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git008.htm index 15825f276..a3360b392 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git008.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git008.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Git Pull from Remote Repository Wizard: Remote Repository</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git009.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git009.htm index a0da9bcbb..da5e0b84e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git009.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git009.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Git Pull from Remote Repository Wizard: Remote Branches</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git010.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git010.htm index 6cf2cfb7b..2d9e0344b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git010.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git010.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Git Push to Remote Repository Wizard: Remote Repository</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git011.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git011.htm index c94cb2263..daacf8704 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git011.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git011.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Git Push to Remote Repository Wizard: Select Local Branches</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git012.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git012.htm index 05758ae65..3686a2086 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git012.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git012.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Git Push to Remote Repository Wizard: Update Local References</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git013.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git013.htm index 4621c3246..04468a775 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git013.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git013.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Git: Checkout Selected Revision Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git014.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git014.htm index c538348ca..dbbc5b48a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git014.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git014.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Git: Create Branch Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git015.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git015.htm index 33bf21534..180f7f6e7 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git015.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git015.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Git: Commit Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git016.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git016.htm index 4f1163f5e..a187588d8 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git016.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git016.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Git: Select Revision Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git017.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git017.htm index 24df6d5cf..0ed928902 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git017.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git017.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Git: Checkout Selected Paths Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git018.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git018.htm index 89eb55eeb..97f4b5ecd 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git018.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git018.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Git: Switch To Selected Branch Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git019.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git019.htm index 150282a01..6b896c297 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git019.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git019.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Git: Revert Modifications Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git020.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git020.htm index e4a1999fe..d105bc9bb 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git020.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git020.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Git: Revert Commit Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git021.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git021.htm index f81a0d54c..99818afd6 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git021.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git021.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Git: Create Tag Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git022.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git022.htm index 6ba1d0162..96b724fc7 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git022.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git022.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Git: Manage Tags Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git023.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git023.htm index d4d3391be..5e9e166dc 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git023.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git023.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Git: Merge Revision Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git024.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git024.htm index d4b6efe90..855152d70 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git024.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git024.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Git: Versioning View</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git025.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git025.htm index e01a08de0..b41ddb542 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git025.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git025.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Git: Reset Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git026.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git026.htm index 19371087c..b53a064de 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git026.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git026.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Git: Repository Browser</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git027.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git027.htm index 46e21599a..b1fb058e9 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git027.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git027.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Git: Select Template Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git028.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git028.htm index e4fb9f970..097ae883c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git028.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git028.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Git: Select Commits to Rebase Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git029.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git029.htm index 88fa44efd..a174bdb1a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git029.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git029.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Git: Select Revisions To Diff Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git030.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git030.htm index 9cfebac68..5df46577f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git030.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git030.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Open Projects Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git031.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git031.htm index d13b25048..927651408 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git031.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git031.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Git: Cherry Pick Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git032.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git032.htm index 75e407f57..1177d67a6 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git032.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git032.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Git: Stash Changes Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git033.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git033.htm index d5b6e826e..141073c2f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git033.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git033.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Git: Shelve Changes Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html.htm index 994e158f9..00bff32dd 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>HTML5/JavaScript</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html001.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html001.htm index bb8441871..13e7c7705 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html001.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html001.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Configure JS Test Driver Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html002.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html002.htm index 1b181868b..30bf80ca9 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html002.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html002.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New HTML5/JS Application Wizard: Name and Location</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html003.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html003.htm index 12be38d4f..bfdd41bb2 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html003.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html003.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New HTML5/JS Application Wizard: Site Template</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html004.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html004.htm index 8c0f3bd87..c5ebb16bf 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html004.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html004.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New HTML5/JS Application With Existing Sources Wizard: Name and Location</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html005.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html005.htm index 5fce6eae0..28fac3b36 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html005.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html005.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Create Site Template from Current Project Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html006.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html006.htm index 56f758b8e..2f8e9f51f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html006.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html006.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Project Properties Window: Sources</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html007.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html007.htm index 9b24ade33..0d9b09a80 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html007.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html007.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Project Properties Window: JavaScript Libraries: npm</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html008.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html008.htm index 16f8f10a0..04573967e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html008.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html008.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Project Properties Window: JavaScript Libraries: Bower</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html009.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html009.htm index 262a2a096..811cdf240 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html009.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html009.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Project Properties Window: JavaScript Libraries: CDNJS</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html010.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html010.htm index 05874bc3d..5fdf2844f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html010.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html010.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Project Properties Window: JavaScript Frameworks: RequireJS</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html011.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html011.htm index 499306864..6f811f6a7 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html011.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html011.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Project Properties Window: Run</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html012.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html012.htm index b795b98de..16f3405a5 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html012.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html012.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Project Properties Window: JavaScript: Oracle JET</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html013.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html013.htm index 0b89105b9..3000b0aeb 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html013.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html013.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Project Properties Window: Node.js</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html014.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html014.htm index de13b4a29..14d789822 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html014.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html014.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>HTML5: Customize Window Settings Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html015.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html015.htm index b95c0bafc..6c110298c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html015.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html015.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>JavaScript Breakpoint Properties: Line</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html016.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html016.htm index b939097e7..ecd4a1972 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html016.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html016.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>JavaScript Breakpoint Properties: DOM</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html017.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html017.htm index abb41e0e2..1eb88462d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html017.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html017.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>JavaScript Breakpoint Properties: Event</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html018.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html018.htm index 4f3bddc7f..b404a6e07 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html018.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html018.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>JavaScript Breakpoint Properties: XMLHttpRequest</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html019.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html019.htm index b875247f6..2abc4c970 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html019.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html019.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New HTML5/JS Application Wizard: Mobile Platforms</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html020.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html020.htm index cae1a7d43..24cc5d4e7 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html020.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html020.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Project Properties Window: CSS Preprocessors</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html021.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html021.htm index 7b5b67913..bfb6e398b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html021.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html021.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Project Properties Window: Cordova</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html022.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html022.htm index 8bdc08795..7c02d8e68 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html022.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html022.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Project Properties Window: JavaScript</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html023.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html023.htm index 061e653bf..82c1a3678 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html023.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html023.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New HTML5/JS Application Wizard: Cordova Support</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html024.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html024.htm index c9c02e92f..5fdc17a4f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html024.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html024.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Options Window: HTML/JS: Node.js</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html025.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html025.htm index 8939b04f6..6047dbafb 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html025.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html025.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Options Window: HTML/JS: Bower</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html026.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html026.htm index 9588fcd10..62ff59d07 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html026.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html026.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Options Window: HTML/JS: Grunt</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html027.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html027.htm index de1907e6d..a59cac760 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html027.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html027.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Options Window: HTML/JS: Gulp</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html028.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html028.htm index a457758db..02816514b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html028.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html028.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Options Window: HTML/JS: Karma</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html029.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html029.htm index 8189d0612..5bd7c5d3f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html029.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html029.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Options Window: Java: Nashorn</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html030.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html030.htm index 99e38d4a4..b5bbd42e2 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html030.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html030.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New HTML5/JS Application with Node.js Wizard: Name and Location</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html031.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html031.htm index 0a96cb596..de4c3dc88 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html031.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html031.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New HTML5/JS Application with Node.js Wizard: Express</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug.htm index 91f95b9c3..d37fba6a5 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Java Debugging</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug001.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug001.htm index 4c32bc5bf..3fd2a9ef6 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug001.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug001.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Debugging: Analyze Stack Window</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug002.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug002.htm index 87d52a17c..bc696bd88 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug002.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug002.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Breakpoint Properties: Class</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug003.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug003.htm index 2b98fcdaf..37a97f21c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug003.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug003.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Breakpoint Properties: Exception</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug004.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug004.htm index 0551cd972..b95c619fb 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug004.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug004.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Breakpoint Properties: Line</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug005.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug005.htm index fbcac5ebc..128892d8e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug005.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug005.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Breakpoint Properties: Method</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug006.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug006.htm index b8bebf6f6..91a18458f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug006.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug006.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Breakpoint Properties: Thread</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug007.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug007.htm index 76694be0f..ffa1c5f7a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug007.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug007.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Breakpoint Properties: Field</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug008.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug008.htm index 054822278..811e60b0a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug008.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug008.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Breakpoints Window</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug009.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug009.htm index 2d8378a25..e926e2471 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug009.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug009.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Debugging: Call Stack Window</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug010.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug010.htm index f6d154935..3687b9e25 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug010.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug010.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Debugging: Loaded Classes Window</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug011.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug011.htm index 485945660..9ba2bc059 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug011.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug011.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Options Window: Java: Java Debugger</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug012.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug012.htm index b992bde56..47bd659b6 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug012.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug012.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Debugger Console and Process Output Tabs in the Output Window</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug013.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug013.htm index f8262f92a..97a7bb560 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug013.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug013.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Debugger Windows</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug014.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug014.htm index 01be74ced..593fec8cb 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug014.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug014.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Debugging: Evaluate Code Window</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug015.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug015.htm index 025a9e409..d1e0ef4a0 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug015.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug015.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Debugging: Events Window</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug016.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug016.htm index 191f8f337..8b9eee481 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug016.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug016.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Old Method on Stack Alert Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug017.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug017.htm index c2ba30e17..2d7d345e1 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug017.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug017.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Debugging: Sessions Window</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug018.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug018.htm index ec3d983bb..e07455e1b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug018.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug018.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Debugging: Sources Window</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug019.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug019.htm index e5f80e813..419f19a4e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug019.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug019.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Debugging: Threads Window</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug020.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug020.htm index b1535bdbb..5fbfa4dfc 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug020.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug020.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Debugging: Variables Window</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug021.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug021.htm index c8be91d75..d8d9786d7 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug021.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug021.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Debugging: Watches Window</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug022.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug022.htm index 6acc84f5b..a6198415b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug022.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug022.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Watch Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug023.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug023.htm index 53a6a2f73..ded9db6f5 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug023.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug023.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Debugging View</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug024.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug024.htm index 8f862887d..c63fee3b5 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug024.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug024.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Attach Debugger Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_edit.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_edit.htm index e6979daa4..0ef7d0331 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_edit.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_edit.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Using Java Editor</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_edit001.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_edit001.htm index 5c910f084..fe145f614 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_edit001.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_edit001.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>About the Java Source Editor</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_edit002.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_edit002.htm index 4b69e7cd6..9d3b115d0 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_edit002.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_edit002.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Inspect Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee.htm index 12902bb75..f964bdae3 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Using Java EE</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee001.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee001.htm index 44b68ab05..72ab19ab4 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee001.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee001.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Enterprise Application Client Project Properties Dialog Box: Compiling</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee002.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee002.htm index a59c2f3cb..40122e83e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee002.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee002.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Enterprise Application Client Project Properties Dialog Box: Documenting</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee003.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee003.htm index ca79fe5eb..4ab60afec 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee003.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee003.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Enterprise Application Client Project Properties Dialog Box: Libraries</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee004.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee004.htm index 614d1b203..4db4b7f9f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee004.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee004.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Enterprise Application Client Project Properties Dialog Box: Packaging</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee005.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee005.htm index e3ec26626..47d554038 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee005.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee005.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Enterprise Application Client Project Properties Dialog Box: Run</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee006.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee006.htm index b4d259703..8b134d842 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee006.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee006.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Enterprise Application Client Project Properties Dialog Box: Sources</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee007.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee007.htm index 437dc4758..27f80218b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee007.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee007.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Enterprise Application Client Project Properties Dialog Box: Web Service Clients</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee008.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee008.htm index ca8eb2d93..ffb331245 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee008.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee008.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Enterprise Application Client Project Properties Dialog Box: Disabled Web Service Clients</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee009.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee009.htm index a602ea608..6b7a7ddc5 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee009.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee009.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Enterprise Application Client with Existing Sources Wizard: Name and Location</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee010.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee010.htm index 9dcd317d3..3a2c92bc0 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee010.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee010.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Enterprise Application Client with Existing Sources Wizard: Existing Sources and Libraries</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee011.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee011.htm index 7e5e72ee5..819961b9c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee011.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee011.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Enterprise Application Client Wizard: Name and Location</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee012.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee012.htm index ddfb4ffe4..46358d187 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee012.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee012.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Enterprise Application Client Wizard: Server and Settings</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee013.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee013.htm index d6c49c8c2..161aec77e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee013.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee013.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Call Enterprise Bean Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee014.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee014.htm index a07a7c2c0..73cd72a71 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee014.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee014.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Entity Bean Wizard</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee015.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee015.htm index 445f19089..843f5ccf6 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee015.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee015.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Message-Driven Bean Wizard: Name and Location</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee016.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee016.htm index e017363b9..d960eb169 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee016.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee016.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Message-Driven Bean Wizard: Activation Config Properties</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee017.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee017.htm index 05b828c18..be7e5ad91 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee017.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee017.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Add Message Destination Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee018.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee018.htm index ac2078ed6..61fbfc1a0 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee018.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee018.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Session Bean Wizard</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee019.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee019.htm index c2abd5ca3..be62f6b39 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee019.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee019.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New EJB Module Wizard: Name and Location</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee020.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee020.htm index 554aae206..73e40ede0 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee020.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee020.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New EJB Module Wizard: Server and Settings</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee021.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee021.htm index 95e81e5d8..3d5d5ac74 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee021.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee021.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New EJB Module with Existing Sources Wizard: Name and Location</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee022.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee022.htm index cc9c7e4f6..3c8554834 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee022.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee022.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New EJB Module with Existing Sources Wizard: Existing Sources and Libraries</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee023.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee023.htm index e3d1c31c9..4019e87aa 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee023.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee023.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Add Library Dialog Box (EJB Module)</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee024.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee024.htm index 32a1c71a2..5b448a3e0 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee024.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee024.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Standard EJB Module Project Properties Dialog Box: Compiling</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee025.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee025.htm index 7e52ad1ff..691ee20a2 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee025.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee025.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Standard EJB Module Project Properties Dialog Box: Documenting</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee026.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee026.htm index 956efd50a..fc2ed8ccf 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee026.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee026.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Standard EJB Module Project Properties Dialog Box: Libraries</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee027.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee027.htm index 160049f55..37323c07c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee027.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee027.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Standard EJB Module Project Properties Dialog Box: Packaging</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee028.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee028.htm index 5717af28c..7dd5400b6 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee028.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee028.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Standard EJB Module Project Properties Dialog Box: Run</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee029.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee029.htm index 62ad491aa..dd08abfc3 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee029.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee029.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Standard EJB Module Project Properties Dialog Box: Sources</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee030.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee030.htm index 7dc6bfe3e..49d592cb5 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee030.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee030.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Standard EJB Module Project Properties Dialog Box: Web Services</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee031.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee031.htm index 3ff6e72db..adecd87d3 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee031.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee031.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Standard Enterprise Application Project Properties Dialog Box: Sources</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee032.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee032.htm index 3e65a804f..df6ed182f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee032.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee032.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Standard Enterprise Application Project Properties Dialog Box: Compile</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee033.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee033.htm index 3d160cd48..c27ad99c0 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee033.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee033.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Standard Enterprise Application Project Properties Dialog Box: Packaging</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee034.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee034.htm index f5e506870..a04e86af5 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee034.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee034.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Standard Enterprise Application Project Properties Dialog Box: Libraries</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee035.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee035.htm index cb3b812ef..18fbb0755 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee035.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee035.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Standard Enterprise Application Project Properties Dialog Box: Run</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee036.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee036.htm index cc06ea5e3..52ea2a9cd 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee036.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee036.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Enterprise Application with Existing Sources: Name and Location</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee037.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee037.htm index 821e914d7..709e201bb 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee037.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee037.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Enterprise Application Wizard with Existing Sources: Server and Settings</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee038.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee038.htm index 1c1518757..2ff33559d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee038.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee038.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Enterprise Application with Existing Sources: Application Modules</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee039.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee039.htm index 399ad4b44..729be4281 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee039.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee039.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Enterprise Application Wizard: Name and Location</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee040.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee040.htm index a4daf33f9..751ec1e52 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee040.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee040.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Enterprise Application Wizard: Server and Settings</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee041.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee041.htm index 7ee00ad6f..530e9796a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee041.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee041.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Specify Mail Resource Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee042.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee042.htm index f2651cc2f..8d6ab823f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee042.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee042.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Send JMS Message Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee043.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee043.htm index 484a429d2..85d12674e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee043.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee043.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Choose Database Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee044.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee044.htm index 6137d973a..dd8172d4c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee044.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee044.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Create Data Source Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee045.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee045.htm index a16a340bc..791729e99 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee045.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee045.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Resolve Data Sources Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee046.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee046.htm index c313754be..9e9c1ad1e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee046.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee046.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Session Beans for Entity Classes: Entity Classes</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee047.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee047.htm index 50e7e1a47..59461fc25 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee047.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee047.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Session Beans for Entity Classes: Generated Session Beans</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee048.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee048.htm index 44546647c..4feab2010 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee048.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee048.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Registering an Oracle WebLogic Server</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee049.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee049.htm index 51c0c6669..62bd5194f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee049.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee049.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Add Server Instance Wizard: Oracle WebLogic Server Instance Location</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee050.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee050.htm index 55163924e..f9f4e9e4e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee050.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee050.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Add Server Instance Wizard: Oracle WebLogic Server Instance Properties</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee051.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee051.htm index c35429841..69e1ebd43 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee051.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee051.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Add Server Instance Wizard: Oracle WebLogic Server Instance Properties</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee052.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee052.htm index 48f4b22b3..ec989d71d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee052.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee052.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Visual Editor: Add Group</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee053.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee053.htm index 0d3753506..8899c7693 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee053.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee053.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Visual Editor: Add Principal</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee054.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee054.htm index ccf0fa420..eaca34557 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee054.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee054.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Visual Editor: Edit Group</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee055.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee055.htm index 73246730c..0aa77cf2e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee055.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee055.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Visual Editor: Edit Principal</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee056.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee056.htm index a89320a22..10a61dcc4 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee056.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee056.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Visual Editor: Message Security</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee057.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee057.htm index e00d52f11..0403cd3b7 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee057.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee057.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Visual Editor: Message Security Bindings</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee058.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee058.htm index e292daf16..8723608e4 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee058.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee058.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Deployment Descriptor Visual Editor: Security</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee059.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee059.htm index df993659a..0d11d2e39 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee059.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee059.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Deployment Descriptor Visual Editor: Servlets</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee060.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee060.htm index 7b1e0942b..faee4a51f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee060.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee060.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>glassfish-web.xml Visual Editor: General</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee061.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee061.htm index 75a484a67..b310c5dda 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee061.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee061.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Deployment Descriptor Visual Editor: Messaging</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee062.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee062.htm index caa8a5839..bb6ddb0b5 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee062.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee062.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Deployment Descriptor Visual Editor: Web Service Clients</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee063.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee063.htm index 8eedf43b7..2fa643953 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee063.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee063.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Deployment Descriptor Visual Editor: Web Services</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee064.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee064.htm index 849158314..2da07b31a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee064.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee064.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>glassfish-application-client.xml Visual Editor: General</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee065.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee065.htm index 85fda2e9d..5503accb5 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee065.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee065.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Deployment Descriptor Visual Editor: Environment</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee066.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee066.htm index 0dc886b04..ddf740341 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee066.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee066.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Deployment Descriptor Visual Editor: EJB</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee067.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee067.htm index e441c060e..ce0bc982b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee067.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee067.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>glassfish-ejb-jar.xml Visual Editor: General</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee068.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee068.htm index bd0570c41..5644eb34d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee068.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee068.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New JDBC Connection Pool: Choose Database Connection</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee069.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee069.htm index 74d1b948e..12e928781 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee069.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee069.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New JDBC Connection Pool: Add Connection Pool Properties</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee070.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee070.htm index 437e9a9c2..58261b847 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee070.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee070.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New JDBC Connection Pool: Add Connection Pool Optional Settings</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee071.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee071.htm index 2ba4928f9..6c49b26ed 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee071.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee071.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New JDBC Resource: General Attributes</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee072.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee072.htm index 5495f452d..33379fc15 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee072.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee072.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New JDBC Resource: Additional Properties</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee073.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee073.htm index cedfc83ba..d0f48c035 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee073.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee073.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>JMS Resource General Attributes</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee074.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee074.htm index db16afd7b..2479e73c0 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee074.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee074.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>JMS Resource Properties</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee075.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee075.htm index 38b411d19..ad83089f8 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee075.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee075.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>JavaMail Session: General Attributes</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee076.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee076.htm index 6d465ac22..39978ff39 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee076.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee076.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>JavaMail Session Properties</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee077.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee077.htm index f61f62bf5..46918a1de 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee077.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee077.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Add Server Instance Wizard: Domain Folder Location</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee078.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee078.htm index 1193ddd34..bf61c885d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee078.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee078.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Add Server Instance Wizard: Domain Admin Port Info</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee079.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee079.htm index 6b2f5c25e..0f67402b7 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee079.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee079.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Add Server Instance Wizard: Domain Admin Login Info</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee080.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee080.htm index 68cd7efb7..8900d7ae7 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee080.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee080.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Add Server Instance Wizard: Server Location</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee081.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee081.htm index b184328e6..f8b6c8e0e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee081.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee081.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Add Server Wizard: Creation Properties</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee082.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee082.htm index c7adae0c1..18ae0bc8d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee082.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee082.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Add Server Instance Wizard: GlassFish Server Location</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee083.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee083.htm index 6a2259127..aa3561e0e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee083.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee083.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Add Server Instance Wizard: GlassFish Domain Name/Location</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee084.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee084.htm index 278cd4761..29cb34699 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee084.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee084.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Servers Manager</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee085.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee085.htm index bf3317552..f5efef316 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee085.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee085.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Add Server Instance Wizard: Tomcat Installation and Login Details</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee086.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee086.htm index 8aea05cd8..ddf9e8b80 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee086.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee086.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Web Service from WSDL Wizard: Name and Location</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee087.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee087.htm index ae6a25741..c2ebe90f8 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee087.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee087.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Web Service Wizard: Name and Location</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee088.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee088.htm index fb72e7e76..bf1db924f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee088.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee088.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Web Service Client Wizard: WSDL and Client Location</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee089.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee089.htm index f5d816786..bcbf860e3 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee089.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee089.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Message Handler Wizard: Specify SOAP Message Handler Class Information</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee090.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee090.htm index fa80346ea..b9ec2a6c9 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee090.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee090.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Logical Handler Wizard: Specify Logical Message Handler Class Information</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee091.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee091.htm index 23438c233..de7840a3f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee091.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee091.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Web Service Attributes Editor</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee092.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee092.htm index 93aaf283c..4a9eda88a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee092.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee092.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Web Service Attributes Editor: Quality of Service: Port Binding</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee093.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee093.htm index 618b4e910..43782ae63 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee093.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee093.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Web Service Attributes Editor: Quality of Service: Operations</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee094.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee094.htm index f55b398d3..4e2127903 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee094.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee094.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Web Service Attributes Editor: Quality of Service: Operation</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee095.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee095.htm index 4627638f3..32e3bfe43 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee095.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee095.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Web Service Attributes Editor: Quality of Service: Input Message</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee096.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee096.htm index f66b8d3a1..65dd32095 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee096.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee096.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Web Service Attributes Editor: Quality of Service: Output Message</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee097.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee097.htm index dab876e74..21f16e887 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee097.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee097.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Web Service Attributes Editor: Quality of Service: Add Header</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee098.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee098.htm index 53f4971e5..cd8062e19 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee098.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee098.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Web Service Attributes Editor: Quality of Service: Transport</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee099.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee099.htm index 2c37cefc2..e87ded6c4 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee099.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee099.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Web Service Attributes Editor: Quality of Service: Security</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee100.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee100.htm index 6c3ee005c..0827733eb 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee100.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee100.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Web Service Attributes Editor: Quality of Service: Advanced Configuration</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee101.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee101.htm index d8744e3f1..7ba030cb4 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee101.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee101.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Web Service Attributes Editor: WSDL Customization: Global Customization</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee102.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee102.htm index ca5728f6b..bae390103 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee102.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee102.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Web Service Attributes Editor: WSDL Customization: Port Types</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee103.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee103.htm index db3e971e6..39e79af9b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee103.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee103.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Web Service Attributes Editor: WSDL Customization: Port Type Faults</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee104.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee104.htm index 8bc1ec594..7b06533e0 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee104.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee104.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Web Service Attributes Editor: WSDL Customization: Bindings</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee105.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee105.htm index 4da7dca48..a9293b2ef 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee105.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee105.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Web Service Attributes Editor: WSDL Customization: Binding Operations</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee106.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee106.htm index 89668d9ee..319ae2a90 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee106.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee106.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Web Service Attributes Editor: WSDL Customization: Services</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee107.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee107.htm index 5873c2d41..647b583ac 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee107.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee107.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Web Service Attributes Editor: WSDL Customization: Ports</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee108.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee108.htm index 389f7e16b..5389bd117 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee108.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee108.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Web Service Attributes Editor: WSDL Customization: External Binding Files</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee109.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee109.htm index 9c6f2d899..9508c16e3 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee109.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee109.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>RESTful Web Services from Patterns Wizard: Specify Resource Classes (Simple Root)</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee110.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee110.htm index 317d46d9f..cc817d97d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee110.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee110.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>RESTful Web Services from Patterns Wizard: Specify Resource Classes (Container Item)</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee111.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee111.htm index 93bb7c143..837576c3f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee111.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee111.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>RESTful Web Services from Patterns Wizard: Specify Resource Classes (Client Controlled Container Item)</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee112.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee112.htm index 1804fe6bb..e8c73bb98 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee112.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee112.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New RESTful JavaScript Client Wizard: Configure JavaScript REST Client</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee113.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee113.htm index e2af6ac6f..55877d583 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee113.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee113.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Add Server Instance Wizard: JBoss Server Instance Properties</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee114.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee114.htm index f734b341b..a08257ab4 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee114.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee114.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Add Server Instance Wizard: JBoss Server Instance Location</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui.htm index 1b18d028a..53ec214d6 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Java GUI</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui001.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui001.htm index 532bc40de..5a6fb517d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui001.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui001.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Advanced Modify Source Dialog</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui002.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui002.htm index 1fef8fceb..2f2ed49fc 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui002.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui002.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Bind Dialog Box: Advanced Tab</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui003.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui003.htm index 5c1b43830..5142123ed 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui003.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui003.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Bind Dialog Box: Binding Tab</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui004.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui004.htm index 4bd92c8aa..001c7a528 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui004.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui004.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>GUI Builder Connection Wizard: Select Source Event</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui005.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui005.htm index e08875b37..811bcc212 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui005.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui005.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>GUI Builder Connection Wizard: Specify Target Operation</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui006.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui006.htm index 3725d4d21..8427cca33 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui006.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui006.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>GUI Builder Connection Wizard: Enter Parameters</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui007.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui007.htm index 8e10bb372..f2b43a805 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui007.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui007.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Customize Code Dialog Box (Swing GUI Builder)</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui008.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui008.htm index 7c985dfb3..2b6f1e56a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui008.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui008.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Event Handler Dialog</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui009.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui009.htm index 1fc3f4193..933e37310 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui009.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui009.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>GUI Builder: GridBag Customizer</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui010.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui010.htm index 3967c22cb..4e27e858b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui010.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui010.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>GUI Builder</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui011.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui011.htm index 745a33a98..5bde07a95 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui011.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui011.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Variables Modifier Property Editor</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui012.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui012.htm index 2500b113b..c274814ac 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui012.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui012.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Palette Window</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui013.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui013.htm index 9800a9ffa..ab574d5bd 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui013.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui013.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>GUI Builder: Preview Window</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui014.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui014.htm index 53c04e75f..cb08bdbc6 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui014.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui014.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>GUI Builder: Property Editors</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui015.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui015.htm index 5e0952eb6..c1da7f4de 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui015.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui015.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Master/Detail Form Wizard: Detail Option</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui016.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui016.htm index 87f17d4a2..cb48152e8 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui016.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui016.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Master/Detail Form Wizard: Master Table</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui017.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui017.htm index 571611430..1806eac43 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui017.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui017.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New JavaFX Application</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui018.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui018.htm index 0308fb04d..7253cc680 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui018.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui018.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New JavaFX Application (FXML)</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui019.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui019.htm index be6d80cbd..eead188d3 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui019.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui019.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New JavaFX Preloader</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui020.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui020.htm index 850ccee8a..63ddc9c47 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui020.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui020.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New JavaFX in Swing Application</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui021.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui021.htm index e75889b02..0f70dd999 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui021.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui021.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Java FX Project Properties: Deployment</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui022.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui022.htm index b1a36f21f..b8353a347 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui022.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui022.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Java FX Project Properties: Run</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me.htm index 74d16d278..bb2739e31 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Using Java ME</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me001.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me001.htm index 23e411ef1..96e00f65c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me001.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me001.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Add/Edit Attribute</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me002.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me002.htm index a93dca769..a38daec06 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me002.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me002.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Add Keystore</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me003.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me003.htm index fb2555cc6..2f73bf2a6 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me003.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me003.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Add Libraries</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me004.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me004.htm index e673036df..f71c9c1f9 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me004.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me004.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Add/Edit MIDlet</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me005.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me005.htm index c4cffded3..d03d2a402 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me005.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me005.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Add/Edit Push Registry Entry</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me006.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me006.htm index a6495e0e3..0d7b69fca 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me006.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me006.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Create Key Pair</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me007.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me007.htm index 6b6118cd2..dae37db51 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me007.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me007.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Enter Password</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me008.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me008.htm index 81cb6854a..28cdac975 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me008.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me008.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Export Key</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me009.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me009.htm index eea377bd6..b36c7b295 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me009.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me009.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Keystores Manager</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me010.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me010.htm index 0bcf71bc1..054aef94e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me010.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me010.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Java ME Project Node</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me011.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me011.htm index eeae2655a..b494c66e7 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me011.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me011.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Add Java Platform Wizard: Select Platform Type</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me012.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me012.htm index e011e4ec3..017bc6773 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me012.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me012.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Add Java Platform Wizard: Platform Folders Page</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me013.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me013.htm index 10e766400..f9a89f6fd 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me013.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me013.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Add Java Platform Wizard: Detected Platforms Page</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me014.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me014.htm index 04dddcfa8..9d2d1449d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me014.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me014.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Add Java Platform Wizard: General Information Page</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me015.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me015.htm index 399bd32bf..509640b62 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me015.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me015.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Add Java Platform Wizard: Bootstrap Libraries Page</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me016.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me016.htm index aa0c9b0cb..55ef96a11 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me016.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me016.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Add Java Platform wizard: Sources and Javadoc Page</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me017.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me017.htm index f945837b4..cd03b8549 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me017.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me017.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Embedded Application Wizard: Project Name and Location Page</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me018.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me018.htm index b0516514b..bf7a9c53c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me018.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me018.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Embedded Application Wizard: Default Platform Selection Page</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me019.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me019.htm index f74a704ed..121aa0a80 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me019.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me019.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Embedded Application Wizard: More Configurations Selection Page</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me020.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me020.htm index b24527779..58000a6f6 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me020.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me020.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New MIDP File Wizard: Name and Location Page</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me021.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me021.htm index 763dee434..8b4ad608c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me021.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me021.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Java ME Embedded Application Wizard: Name and Location</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me022.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me022.htm index a52d37e3c..08917184e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me022.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me022.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Java ME Embedded Project Properties Dialog Box: Sources</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me023.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me023.htm index d71dd7689..998f94f86 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me023.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me023.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Java ME Embedded Project Properties Dialog Box: Platform</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me024.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me024.htm index 8c4302718..584552105 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me024.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me024.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Java ME Embedded Project Properties Dialog Box: Libraries</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me025.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me025.htm index 27f3ecb7a..1bf1f9d19 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me025.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me025.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Java ME Embedded Project Properties Dialog Box: Application Descriptor</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me026.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me026.htm index 612c39d57..ea1565222 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me026.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me026.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Java ME Embedded Project Properties Dialog Box: Compiling</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me027.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me027.htm index f77fae9f2..938dc797f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me027.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me027.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Java ME Embedded Project Properties Dialog Box: Signing</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me028.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me028.htm index 93e53530d..056fa4105 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me028.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me028.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Java ME Embedded Project Properties Dialog Box: Obfuscating</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me029.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me029.htm index 33195813a..a8f7844b7 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me029.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me029.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Java ME Embedded Project Properties Dialog Box: Documenting</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me030.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me030.htm index e98040396..5cea21b4e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me030.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me030.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Java ME Embedded Project Properties Dialog Box: Run</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me031.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me031.htm index 2f6f81c15..f38e807d5 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me031.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me031.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Add/Edit Permission for API</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project.htm index d04e939d3..47bb124b4 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Java Projects</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project001.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project001.htm index 95482569c..49dbdbb1b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project001.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project001.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Add Java Platform Wizard: Choose Platform Folder</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project002.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project002.htm index a72da3c0d..30890d610 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project002.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project002.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Add Java Platform Wizard: Platform Name</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project003.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project003.htm index c89a6434a..c4ccaef19 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project003.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project003.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Java Project with Existing Sources Wizard: Name and Location</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project004.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project004.htm index 4d510c661..8a56c6143 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project004.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project004.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Java Project with Existing Sources Wizard: Existing Sources</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project005.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project005.htm index aa4278851..e04ade732 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project005.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project005.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Java Project with Existing Sources Wizard: Includes &amp; Excludes</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project006.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project006.htm index 4309a58f9..3eef762d1 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project006.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project006.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Free-Form Project Properties Dialog Box: Build and Run</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project007.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project007.htm index 36f1b5948..a598a5c8e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project007.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project007.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Free-Form Project Properties Dialog Box: Java Sources Classpath</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project008.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project008.htm index b46f4eb2b..d64ee87e1 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project008.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project008.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Free-Form Project Properties Dialog Box: Output</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project009.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project009.htm index 953fb9b3a..63299eaf3 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project009.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project009.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Free-Form Project Properties Dialog Box: Java Sources</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project010.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project010.htm index c83369f47..3baaeeaba 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project010.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project010.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Free-form Project Wizard: Name and Location</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project011.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project011.htm index fa5477c84..31a3fe5eb 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project011.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project011.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Free-Form Project Wizard: Build and Run Actions</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project012.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project012.htm index f16607c73..9117b544a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project012.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project012.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Free-Form Project Wizard: Source Package Folders</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project013.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project013.htm index 460bc21fb..32cfb4c1f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project013.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project013.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Free-Form Project Wizard: Java Sources Classpath</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project014.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project014.htm index 0d07905fc..125f8dafe 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project014.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project014.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Free-Form Project Wizard: Project Output</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project015.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project015.htm index 1b81aeb31..08ac01863 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project015.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project015.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Standard Java SE Project Properties Dialog Box: Application</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project016.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project016.htm index 12eb21008..305715958 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project016.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project016.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Standard Java SE Project Properties Dialog Box: Compiling</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project017.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project017.htm index 08df9d205..96f2aa5e6 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project017.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project017.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Standard Java SE Project Properties Dialog Box: Documenting</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project018.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project018.htm index 7d74fee26..db30286c2 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project018.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project018.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Standard Java SE Project Properties Dialog Box: Libraries</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project019.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project019.htm index 1d353a1cf..7acf3cd42 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project019.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project019.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Standard Java SE Project Properties Dialog Box: Packaging</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project020.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project020.htm index 9057f6a4a..08e44b0c9 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project020.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project020.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Standard Java SE Project Properties Dialog Box: Run</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project021.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project021.htm index 12f7a143d..97c785287 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project021.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project021.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Standard Java SE Project Properties Dialog Box: Sources</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project022.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project022.htm index a24675740..db2d6fa98 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project022.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project022.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Standard Java SE Project Properties Dialog Box: Deployment</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project023.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project023.htm index 39dd8326d..c1f668521 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project023.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project023.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Standard Java SE Project Properties Dialog Box: Web Start</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project024.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project024.htm index 78664b574..dd09c1ae8 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project024.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project024.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Standard Java SE Project Properties Dialog Box: Web Service Clients</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project025.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project025.htm index e1098c021..0ce89a797 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project025.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project025.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Standard Java SE Project Properties Dialog Box: Disabled Web Service Clients</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project026.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project026.htm index 3b6de0f4a..d2469dff1 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project026.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project026.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Java Application Wizard: Name and Location</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project027.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project027.htm index 9643c916e..0c314db51 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project027.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project027.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Java Class Library Wizard: Name and Location</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project028.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project028.htm index 272a26101..8b1c2ccb4 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project028.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project028.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Libraries Wizard: Library Folder</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project029.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project029.htm index ee6371f2f..f9568edb7 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project029.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project029.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Libraries Wizard: Actions</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project030.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project030.htm index 64e3a0716..9124c54d6 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project030.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project030.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Java Platform Manager Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project031.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project031.htm index 684ff6a4c..fd63a1dfb 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project031.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project031.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Configure Include and Excludes Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project032.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project032.htm index a485d25af..c51e0ca88 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project032.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project032.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Options Window: Java: Ant</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project033.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project033.htm index 5a718a314..bcae817f0 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project033.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project033.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Add Java Platform Wizard: Set Up Remote Platform</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project034.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project034.htm index 99ca263f7..bae0037be 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project034.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project034.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Create Java SE Embedded JRE</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa.htm index 660c2be55..6d4f5b360 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Using JPA</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa001.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa001.htm index 83099adeb..8f65d644e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa001.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa001.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>JPQL Query Editor</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa002.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa002.htm index c94f70d6c..4d97732bf 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa002.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa002.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Entity Class Wizard</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa003.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa003.htm index 1cb85bf44..95fff20b6 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa003.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa003.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Entity Classes from Database Wizard: Database Tables</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa004.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa004.htm index 8e3ee429c..3735945e2 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa004.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa004.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Entity Classes from Database Wizard: Entity Classes</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa005.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa005.htm index 4219a3904..c9eb9e338 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa005.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa005.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Entity Classes from Database Wizard: Mapping Options</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa006.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa006.htm index 14322eebe..ba0f23e31 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa006.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa006.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Add Entity Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa007.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa007.htm index f30863f93..2a5797032 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa007.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa007.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New JPA Controller Classes from Entity Class Wizard: Entity Classes</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa008.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa008.htm index 003dad4fb..a4c2148e2 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa008.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa008.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New JPA Controller Classes from Entity Class Wizard: Generate JPA Controller Classes</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa009.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa009.htm index 01d9e61b4..0654dd0a2 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa009.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa009.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>persistence.xml Visual Editor</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa010.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa010.htm index 3ee6463a7..628182c0b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa010.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa010.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Persistence Unit Wizard: Provider and Database</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa011.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa011.htm index 7a27a5619..b01dd8de3 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa011.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa011.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Hibernate Reverse Engineering Wizard: Database Tables</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa012.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa012.htm index a8a8f264d..854d778ca 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa012.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa012.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Hibernate Mapping Files and POJOs Wizard: Generation of Code</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa013.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa013.htm index 00b026cf7..c2c3bba42 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa013.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa013.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Hibernate Mapping Wizard: Select Mapping Class</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa014.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa014.htm index 5d4befd24..a09dc7dc6 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa014.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa014.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Hibernate Configuration Wizard: Select Data Source</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven.htm index f7ca22187..df9a66b6f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Using Maven</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven001.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven001.htm index c26834982..f3e37160b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven001.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven001.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Maven Project Wizard: Maven Archetype</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven002.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven002.htm index 1eefee1b4..0ed2b7039 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven002.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven002.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Maven Project Wizard: Name and Location</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven003.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven003.htm index ccb4224cf..5d11c1011 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven003.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven003.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Maven Project Wizard: Project with Existing POM</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven004.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven004.htm index 16efc93a5..636488d57 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven004.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven004.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Maven Project Wizard: Module Options</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven005.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven005.htm index 7f26ccf99..0f13f91b8 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven005.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven005.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Options Window: Java: Maven</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven006.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven006.htm index 01aad00cd..fc1438372 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven006.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven006.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Project Properties: Maven Project</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial.htm index ce7574611..ee357f64f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Using Mercurial</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial001.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial001.htm index c056d760d..4bf6e35f5 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial001.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial001.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Mercurial: Clone Repository Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial002.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial002.htm index 81949fa76..8cd8007ca 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial002.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial002.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Mercurial: Initialize a Mercurial Repository Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial003.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial003.htm index f9262c8b7..d7f1cda1c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial003.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial003.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Mercurial: Export Diff Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial004.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial004.htm index ba907c8ef..c0ee206bc 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial004.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial004.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Mercurial: Pull Other Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial005.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial005.htm index 1ec76cf48..3bf70e132 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial005.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial005.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Mercurial: Push Other Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial006.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial006.htm index 3a1fdd46f..c209c1093 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial006.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial006.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Mercurial: Merge Revisions Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial007.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial007.htm index 4f7c0bb59..1c0206661 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial007.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial007.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Mercurial: Revert Modifications Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial008.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial008.htm index cebb27ff8..89723bb88 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial008.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial008.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Mercurial: Update Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial009.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial009.htm index a43a68c7a..1ca94fbb8 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial009.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial009.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Mercurial: Select Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial010.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial010.htm index 98bdd3050..c2159d2f2 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial010.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial010.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Mercurial: Create Patch Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial011.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial011.htm index 85f4e1375..3575b7d54 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial011.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial011.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Mercurial: Refresh Patch Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial012.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial012.htm index d2ed3bfd8..08a00af34 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial012.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial012.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Mercurial: Go To Patch Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial013.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial013.htm index 24ab08a67..73fec238f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial013.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial013.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Mercurial: Finish Patches Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial014.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial014.htm index 02f6820ad..042a00c1d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial014.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial014.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Mercurial: Select Template Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial015.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial015.htm index 340b284fb..ee01b0049 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial015.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial015.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Mercurial: Switch Branch In Repository Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial016.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial016.htm index 7711cff08..6e7e76854 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial016.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial016.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Mercurial: Search History</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial017.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial017.htm index 8f5357742..487355ffa 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial017.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial017.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Mercurial: Shelve Changes Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial018.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial018.htm index b3f3f15e4..fcef076ad 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial018.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial018.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Mercurial: Select Changesets to Rebase Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial019.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial019.htm index 8bedda815..05d89dae8 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial019.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial019.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Mercurial: Create Tag Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial020.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial020.htm index 52beb1843..b14145578 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial020.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial020.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Mercurial: Create Branch Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial021.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial021.htm index 6fa78fdfc..19ccc67d2 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial021.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial021.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Mercurial: Manage Tags Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial022.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial022.htm index 6dcaf0601..8397e9b1c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial022.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial022.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Mercurial: Select Revisions to Diff Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial023.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial023.htm index 09519f1d6..63ceb95a5 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial023.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial023.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Mercurial: Select Changeset Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial024.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial024.htm index a58a34dd2..957c233a6 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial024.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial024.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Mercurial: Backout Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial025.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial025.htm index 4f8bb0ddf..25ea72457 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial025.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial025.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Mercurial: Strip Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial026.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial026.htm index bc192a5da..5b3fddd54 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial026.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial026.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Mercurial: Clone External Repository Wizard: Mercurial Repository</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial027.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial027.htm index 9935ece68..bcbb07229 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial027.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial027.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Mercurial: Clone External Repository Wizard: Mercurial Paths</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial028.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial028.htm index ef76026e3..177025968 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial028.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial028.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Mercurial: Clone External Repository Wizard: Change Path</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial029.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial029.htm index 18c34e640..adbf1383c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial029.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial029.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Mercurial: Clone External Repository Wizard: Destination Directory</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial030.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial030.htm index 99db1a783..82b606a4f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial030.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial030.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Mercurial: Commit Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules.htm index 39ac66823..62bd60369 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Working with NetBeans Modules</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules001.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules001.htm index 4132ba111..949a1922e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules001.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules001.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Action Wizard: Name, Icon, and Location</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules002.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules002.htm index cd578013a..b543e5f21 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules002.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules002.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Action Wizard: Action Type</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules003.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules003.htm index 9dad2c555..d6205adae 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules003.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules003.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Add Module Dependency Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules004.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules004.htm index 545f250a4..7f7022f5b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules004.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules004.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Add New Friend Module Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules005.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules005.htm index ee23a82e5..52295b4b2 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules005.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules005.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Module Project: Basic Module Configuration</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules006.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules006.htm index 002430fbf..0e6784248 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules006.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules006.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Module Project: Name and Location</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules007.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules007.htm index c71a832a4..799ad697e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules007.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules007.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>NetBeans Platform Application Project: Name and Location</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules008.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules008.htm index 350d86c64..ed4905c02 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules008.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules008.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Library Wrapper Module Project: Name and Location</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules009.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules009.htm index 185c90988..4e08598d6 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules009.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules009.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Module Suite Project: Name and Location</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules010.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules010.htm index 1c24d9f35..fb0c4ff0c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules010.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules010.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Window Wizard: Basic Settings</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules011.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules011.htm index 6aa5c5720..dede864b6 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules011.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules011.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Code Generator Wizard: Code Generator</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules012.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules012.htm index 66c988db3..bf2ba4929 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules012.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules012.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Feed Reader Sample</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules013.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules013.htm index be4201ea7..337376fd9 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules013.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules013.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>File Type: File Recognition</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules014.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules014.htm index 5d753fbca..4c0677bc5 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules014.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules014.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Action Wizard: GUI Registration</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules015.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules015.htm index 43f03cc82..9d3508068 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules015.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules015.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>JavaHelp Help Set Wizard: Location</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules016.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules016.htm index 176b3a7e3..333cc28a1 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules016.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules016.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Java SE Library Descriptor Wizard: Name and Location</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules017.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules017.htm index b5c776186..9e1c1045d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules017.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules017.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Library Wrapper Module Project: Basic Module Configuration</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules018.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules018.htm index c23cbc7b5..7d6e05755 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules018.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules018.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Library Wrapper Module Project: Select Library</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules019.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules019.htm index 155af7f70..d3b27b78c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules019.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules019.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>File Type: Name, Icon and Location</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules020.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules020.htm index 2fbca7a49..03ba86a6c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules020.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules020.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Installer/Activator Wizard: Installer/Activator</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules021.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules021.htm index 29cbe4253..64b0bec2b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules021.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules021.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>NetBeans Platform Manager Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules022.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules022.htm index 7758d4057..428666182 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules022.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules022.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Options Panel Wizard: Location</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules023.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules023.htm index a6746ea84..a1472bb17 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules023.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules023.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Options Panel Wizard: Choose Panel Type</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules024.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules024.htm index b469beea9..3c3af263c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules024.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules024.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Project Template Wizard: Name and Location</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules025.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules025.htm index 181fca8c1..3254a3ec0 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules025.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules025.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Quick Search Provider Wizard: Quick Search Provider</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules026.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules026.htm index ffbb168c1..0c823e721 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules026.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules026.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Java SE Library Descriptor Wizard: Select Library</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules027.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules027.htm index d51bf89a2..d5d53cb8b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules027.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules027.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Project Template Wizard: Select Project</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules028.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules028.htm index 21e636412..282ae6195 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules028.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules028.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Update Center Wizard: Update Center Declaration</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules029.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules029.htm index 902005aaa..0ffb912e5 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules029.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules029.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Window Wizard: Name, Icon and Location</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules030.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules030.htm index 803b3173b..d515d7738 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules030.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules030.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Wizard Wizard: Name, Icon, and Location</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules031.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules031.htm index badef6d52..ef4758098 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules031.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules031.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Wizard Wizard: Wizard Type</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules032.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules032.htm index 95467b5a7..1ec21a76e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules032.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules032.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Module Project Properties Dialog Box: Compiling</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules033.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules033.htm index 32c076a0b..1708203b8 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules033.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules033.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Module Project Properties Dialog Box: Display</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules034.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules034.htm index 8c99dcf5c..8d2dff021 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules034.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules034.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Module Project Properties Dialog Box: Documenting</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules035.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules035.htm index 3a396ba9d..5fdc0353b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules035.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules035.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Module Project Properties Dialog Box: Libraries</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules036.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules036.htm index 2d85dc020..8fb663735 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules036.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules036.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Module Project Properties Dialog Box: Packaging</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules037.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules037.htm index 12a36d720..893cd79ab 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules037.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules037.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Module Project Properties Dialog Box: Sources</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules038.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules038.htm index 543bcc164..a78e0786b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules038.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules038.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Module Project Properties Dialog Box: API Versioning</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules039.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules039.htm index 8b5d807d2..208dd21a7 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules039.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules039.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Edit Module Dependency Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules040.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules040.htm index 80b11dc16..a7a8686ea 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules040.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules040.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Module Suite Project Properties Dialog Box: Application</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules041.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules041.htm index ec27e8864..3c3881a3f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules041.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules041.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Module Suite Project Properties Dialog Box: Libraries</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules042.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules042.htm index 187b533de..d043bb727 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules042.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules042.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Module Suite Project Properties Dialog Box: Module List</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules043.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules043.htm index e4cd23bc4..999519943 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules043.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules043.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Module Suite Project Properties Dialog Box: Sources</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules044.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules044.htm index 6ba529671..d1e52f355 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules044.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules044.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Module Suite Project Properties Dialog Box: Splash Screen</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules045.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules045.htm index 1b06d918a..31a70c88c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules045.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules045.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Module Suite Project Properties Dialog Box: Window System</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php.htm index 311a34179..449d772bb 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Using PHP</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php001.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php001.htm index c73f6a697..338a18f0b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php001.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php001.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New PHP Project Wizard: Name and Location</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php002.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php002.htm index 759b9a5e6..87839167f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php002.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php002.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New PHP Application from Remote Server: Name and Location</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php003.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php003.htm index 6bd81432f..7522d845b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php003.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php003.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New PHP Project with Existing Sources: Name and Location</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php004.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php004.htm index 098385336..da74091b6 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php004.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php004.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New PHP Project Wizard: Run Configuration</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php005.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php005.htm index 1f2621bd8..b8a92d6c3 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php005.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php005.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New PHP Project with Existing Sources: Run Configuration</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php006.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php006.htm index 1eb0c47b2..a86bca475 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php006.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php006.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New PHP Application from Remote Server: Remote Connection</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php007.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php007.htm index 6bca2484f..a576ab4b6 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php007.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php007.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New PHP Project Wizard: PHP Frameworks</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php008.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php008.htm index a9adcceb9..47602247d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php008.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php008.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Manage Remote Connections Window</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php009.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php009.htm index 9d9526235..e4aed480a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php009.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php009.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Project Properties Window: Sources</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php010.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php010.htm index e3a55db37..3307d9e41 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php010.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php010.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Project Properties Window: Run Configuration</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php011.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php011.htm index a69784285..f179ce761 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php011.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php011.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Project Properties Window: Annotations</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php012.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php012.htm index 327e32319..44b9caf48 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php012.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php012.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Advanced Web Configuration Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php013.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php013.htm index f49779c62..5a746888f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php013.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php013.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Project Properties Window: Include Path</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php014.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php014.htm index 0ece7e146..1328004a2 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php014.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php014.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Project Properties Window: Ignored Folders</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php015.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php015.htm index 3f057500b..ede1dd0a5 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php015.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php015.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Project Properties Window: PHPUnit</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php016.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php016.htm index 34427c6c2..0115556ef 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php016.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php016.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Project Properties Window: PHPDoc</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php017.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php017.htm index c2c11bd3e..1d7a3e9e1 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php017.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php017.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Project Properties Window: ApiGen</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php018.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php018.htm index a360a85c7..a7c9c61a3 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php018.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php018.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Remote Synchronization Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php019.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php019.htm index cb1f15f2a..d6c42f7a9 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php019.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php019.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Find Usages Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php020.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php020.htm index 15d3f7274..cb572f134 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php020.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php020.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Rename Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php021.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php021.htm index 96487e9f0..1fa4a535c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php021.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php021.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Refactoring Window</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php022.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php022.htm index 19b9d7172..df584f376 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php022.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php022.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Delete Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php023.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php023.htm index c1231370d..7aa42abe7 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php023.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php023.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Usages Window</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php024.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php024.htm index 0682b005a..9a36c8c78 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php024.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php024.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>PHP Source Editor</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php025.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php025.htm index b4cd5f5ed..cf62814e7 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php025.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php025.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Options Window: PHP: General</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php026.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php026.htm index 875b0ce7a..a83d208f9 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php026.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php026.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Options Window: PHP: Debugging</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php027.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php027.htm index 59ec6dedc..caa461df9 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php027.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php027.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Options Window: PHP: Frameworks &amp; Tools: PHPUnit</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php028.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php028.htm index 7fc86671f..4802ff2b5 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php028.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php028.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Options Window: PHP: Frameworks &amp; Tools: PhpDoc</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php029.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php029.htm index 6837e55e2..7ef3c6fe9 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php029.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php029.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Options Window: PHP: Frameworks &amp; Tools: Symfony</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php030.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php030.htm index 1dd38bc9b..6cec87cb5 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php030.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php030.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Options Window: PHP: Frameworks &amp; Tools: Symfony2</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php031.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php031.htm index cb71e7c14..7ea2fb2d4 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php031.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php031.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Options Window: PHP: Frameworks &amp; Tools: Zend</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php032.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php032.htm index dc72e4ef0..8ce2e3afb 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php032.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php032.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Options Window: PHP: Frameworks &amp; Tools: Smarty</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php033.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php033.htm index 6b0b377e1..7ac1b1bb1 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php033.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php033.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Options Window: PHP: Custom Annotation Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php034.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php034.htm index 9c96850e4..25811e2cb 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php034.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php034.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Options Window: PHP: Annotations</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php035.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php035.htm index 3b909df2b..8bb83a1a2 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php035.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php035.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Options Window: PHP: Code Analysis</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php036.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php036.htm index 65a79783c..05d883e48 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php036.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php036.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Options Window: PHP: Frameworks &amp; Tools: ApiGen</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php037.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php037.htm index 6f7a43547..58a8bf1ae 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php037.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php037.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Options Window: PHP: Frameworks &amp; Tools: Doctrine2</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php038.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php038.htm index 33ae06e50..76f77a811 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php038.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php038.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Options Window: PHP: Hudson</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php039.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php039.htm index 427297041..1bbc1b110 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php039.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php039.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Options Window: PHP: Frameworks &amp; Tools: Twig</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php040.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php040.htm index 8ba4772b7..bea90c160 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php040.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php040.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Options Window: PHP: Frameworks &amp; Tools: Zend2</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php041.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php041.htm index e33247203..6a08626ee 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php041.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php041.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Options Window: PHP: Frameworks &amp; Tools: Composer</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php042.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php042.htm index 20bb98d69..9e58efdc0 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php042.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php042.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Options Window: PHP: Frameworks &amp; Tools: Atoum</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php043.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php043.htm index 67d99307d..9d1ca01a9 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php043.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php043.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Options Window: PHP: Frameworks &amp; Tools: Nette Tester</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler.htm index 781386534..e8ff2b561 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Profiling</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler001.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler001.htm index 16163ba24..33e901ac9 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler001.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler001.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Attach Profiler: Attach Settings Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler002.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler002.htm index 98773ee11..f6f407699 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler002.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler002.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Choose Heap Dump Destination Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler003.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler003.htm index 486f045e0..fe492ddd0 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler003.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler003.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>OQL Console: Query Properties Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler004.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler004.htm index d3154c38e..ff10e5439 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler004.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler004.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>OQL Console: Save Query Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler005.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler005.htm index 64c5185f5..d3d9874e3 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler005.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler005.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Profiling Point Wizard</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler006.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler006.htm index d3f55c3c5..21d64fa35 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler006.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler006.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Profiling Point Wizard: Choose Type and Project</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler007.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler007.htm index 3dc8d0b81..542c80675 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler007.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler007.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Profiling Point Wizard: Reset Results</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler008.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler008.htm index 36dcae972..fbe6036e2 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler008.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler008.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Profiling Point Wizard: Stopwatch</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler009.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler009.htm index c00e3f4eb..50de6d7b3 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler009.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler009.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Profiling Point Wizard: Take Snapshot</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler010.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler010.htm index e455a952a..45849e13e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler010.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler010.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Profiling Point Wizard: Timed Take Snapshot</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler011.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler011.htm index 8a72b3b9c..a292d7b7a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler011.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler011.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Profiling Point Wizard: Triggered Take Snapshot</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler012.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler012.htm index 6ad63d75b..c619e945e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler012.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler012.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Active Profiling Points Window</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler013.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler013.htm index 2d2a5e5c7..2d53cfdd4 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler013.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler013.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Select Heap Dump to Compare Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler014.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler014.htm index f5ffc134f..e633bb521 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler014.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler014.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Select Snapshot to Compare Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler015.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler015.htm index 5bdbd72a7..4736eb150 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler015.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler015.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Manage Calibration Data Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler016.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler016.htm index 68985a338..37dbfae43 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler016.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler016.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>CPU Snapshot: Find in Results Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler017.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler017.htm index 6446c1854..3926ae3a1 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler017.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler017.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Results Snapshot: Edit User Comments Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler018.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler018.htm index 4a95db168..37fd5a163 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler018.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler018.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>CPU Snapshot: Select Settings Configuration Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler019.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler019.htm index f22c17427..877252ae9 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler019.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler019.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Profiler Window: Rename Snapshot Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler020.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler020.htm index 1611205ab..fab131b28 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler020.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler020.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>OQL Console</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler021.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler021.htm index 3fb617787..623ea3a80 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler021.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler021.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Options Window: Java: Profiler</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler022.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler022.htm index 0ad16f338..12d214382 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler022.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler022.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Profiler Window</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler023.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler023.htm index 6888be783..49b8b3c1a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler023.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler023.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Profiling Points Window</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler024.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler024.htm index a4145c8c6..e0c733e9d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler024.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler024.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Profiling Points Report Window</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler025.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler025.htm index db3c3d5a9..d6341392a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler025.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler025.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>CPU Snapshot Comparison</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler026.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler026.htm index 38327812d..e8b1911da 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler026.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler026.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Memory Snapshot</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler027.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler027.htm index 901fe4bdd..e7d976779 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler027.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler027.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Memory Snapshot Comparison</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler028.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler028.htm index b24b1d1e8..02eb2958b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler028.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler028.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Profiling Threads Window</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler029.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler029.htm index eef1a2316..4c7878a07 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler029.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler029.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Lock Contention Window</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler030.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler030.htm index a7ee88743..97a9e3213 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler030.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler030.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Details of &lt;Process&gt; Dialog</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler031.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler031.htm index becfb524f..983e348ee 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler031.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler031.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Select Method Dialog</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler032.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler032.htm index a3116a955..119c5f948 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler032.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler032.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Select Class Dialog</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler033.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler033.htm index 361a3b28e..0b6690a5b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler033.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler033.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Profile Class / Profile Method (Select Feature) Dialog</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler034.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler034.htm index 8f26c1e11..c5e57cc9b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler034.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler034.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Snapshot Window</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler035.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler035.htm index bcf610b94..4431197d0 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler035.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler035.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Snapshot Information</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler036.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler036.htm index afeef38c2..9af825bc3 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler036.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler036.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Profile Window with Telemetry</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler037.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler037.htm index 148fb42cd..30c5efccb 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler037.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler037.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Profile Window with Methods</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler038.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler038.htm index db12b7988..b1c093021 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler038.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler038.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Profile Window with Objects</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler039.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler039.htm index 49a797c6e..3a802488b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler039.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler039.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Profile Window with Threads</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler040.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler040.htm index c19bc0f49..590be1ea6 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler040.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler040.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Profile Window with Locks</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler041.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler041.htm index 374cc742e..d41b194ea 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler041.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler041.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Profile Window with SQL Queries</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler042.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler042.htm index f569c5d23..ed5c41bc6 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler042.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler042.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Thread Dump Window</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler043.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler043.htm index 8b3efbc87..36b64e560 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler043.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler043.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Methods Snapshot Dialog</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler044.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler044.htm index 4557e0333..20b9e627c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler044.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler044.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Objects Snapshot Dialog</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler045.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler045.htm index 29f7a12ff..45e5009c3 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler045.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler045.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Heap Walker Dialog</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler046.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler046.htm index 9021514db..6dbd1643d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler046.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler046.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>SQL Query Viewer</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler047.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler047.htm index e7471ee9d..bff7ed203 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler047.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler047.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Add Filter</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler048.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler048.htm index 78fea13f3..ab271fe27 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler048.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler048.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Edit Filter</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor.htm index 0acfc266a..12db04414 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Refactoring</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor001.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor001.htm index eb9b49a9f..579771c44 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor001.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor001.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Change Method Parameters Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor002.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor002.htm index 66a64c2f5..c04e85cd2 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor002.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor002.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Copy Class Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor003.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor003.htm index 24f1e69f4..f788b2186 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor003.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor003.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Encapsulate Fields Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor004.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor004.htm index d1151ea7a..d8dfb36f8 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor004.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor004.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Extract Interface Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor005.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor005.htm index 9c5efd7ce..538020dd0 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor005.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor005.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Introduce Method Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor006.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor006.htm index 6379e6d5a..974b5adb3 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor006.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor006.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Extract Superclass Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor007.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor007.htm index e4fe6a0a9..adeb1250a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor007.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor007.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Find Usages Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor008.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor008.htm index 9ba609bc6..9825008eb 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor008.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor008.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Inline Refactoring</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor009.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor009.htm index aa137fab4..32af33f71 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor009.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor009.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Inspect and Transform Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor010.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor010.htm index f28eaecd9..18e9ed5b6 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor010.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor010.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Introduce Local Extension Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor011.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor011.htm index 7a2e05680..0d7bb475a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor011.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor011.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Introduce Parameter Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor012.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor012.htm index e7afbeff8..f057c1888 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor012.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor012.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Invert Boolean Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor013.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor013.htm index fda2a0a4c..2a5e4b742 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor013.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor013.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Move Class Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor014.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor014.htm index 9abe2ce9d..97311849a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor014.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor014.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Move Inner to Outer Level Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor015.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor015.htm index c670365a4..4d0585dcf 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor015.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor015.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Move Members Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor016.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor016.htm index 00d83490e..0eec877f3 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor016.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor016.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Refactoring Window</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor017.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor017.htm index 999ffd6d4..e533724ac 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor017.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor017.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Pull Up Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor018.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor018.htm index 12b7398f1..d3a01cac6 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor018.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor018.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Push Down Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor019.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor019.htm index 79d7ce1ba..79bcddbd9 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor019.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor019.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Syntax Rules for Declarative Hints</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor020.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor020.htm index 565d18dc9..944eda3e5 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor020.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor020.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Rename Class Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor021.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor021.htm index 4769142e2..48f50c4af 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor021.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor021.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Rename Method Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor022.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor022.htm index 94f7b7198..3dac614a3 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor022.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor022.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Rename Field Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor023.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor023.htm index 7e6a42d43..f2dcf1faf 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor023.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor023.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Replace Constructor With Builder Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor024.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor024.htm index b25575d62..414f78df4 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor024.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor024.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Replace Constructor Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor025.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor025.htm index 9536580e7..56620b6b7 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor025.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor025.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Safe Delete Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor026.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor026.htm index c1e329471..6b2a83145 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor026.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor026.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Usages Window</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor027.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor027.htm index c581e7c61..2af7db931 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor027.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor027.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Use Supertype Where Possible Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion.htm index 976501c77..a78f5acd8 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Using Subversion</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion001.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion001.htm index fc00b05f2..e69a255e5 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion001.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion001.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Subversion Checkout Wizard: Subversion Repository</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion002.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion002.htm index c4a37d814..f165b0ca1 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion002.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion002.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Subversion Checkout Wizard: Folders to Checkout</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion003.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion003.htm index 0ce279322..e368863a3 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion003.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion003.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Subversion: Commit Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion004.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion004.htm index 581d06ab2..212c333a0 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion004.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion004.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Subversion: Copy Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion005.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion005.htm index 62c0039c0..2988d4179 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion005.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion005.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Subversion: Diff Viewer</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion006.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion006.htm index f8ad19611..faa55a248 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion006.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion006.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Subversion Import Wizard: Subversion Repository</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion007.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion007.htm index 350d25127..cb46c3d20 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion007.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion007.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Subversion Import Wizard: Repository Folder</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion008.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion008.htm index f51be4960..a621b2588 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion008.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion008.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Subversion Import Wizard: Files to Import</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion009.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion009.htm index 73ebd113b..b83c36db2 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion009.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion009.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Subversion: Property Editor</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion010.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion010.htm index b23309c55..4773f6d32 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion010.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion010.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Subversion: Merge Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion011.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion011.htm index f202a3c3a..38b2b3ddc 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion011.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion011.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Subversion: Relocate Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion012.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion012.htm index 88201ab35..54f05b419 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion012.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion012.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Subversion: Revert Modifications Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion013.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion013.htm index dceeab359..9686d1231 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion013.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion013.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Subversion: History Viewer</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion014.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion014.htm index d7bb7b352..1043b6ba1 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion014.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion014.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Subversion: Switch Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion015.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion015.htm index cefe3f8d8..77b6769fd 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion015.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion015.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Subversion: Versioning Window</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion016.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion016.htm index 46789afc4..055f65a7a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion016.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion016.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Subversion: Property Editor</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion017.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion017.htm index 3282dc481..f867a3958 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion017.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion017.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Subversion: Certificate Verification Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion018.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion018.htm index b16a2760f..d6425e6f5 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion018.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion018.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Subversion: Manage Labels Dialog</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion019.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion019.htm index 1c714918a..22a9c780d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion019.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion019.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Subversion: Select Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion020.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion020.htm index 1aca3bce0..17fcf5cab 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion020.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion020.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Subversion: Search Revisions Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion021.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion021.htm index bfbce1fb6..40c222f63 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion021.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion021.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Subversion: Search Revisions Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion022.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion022.htm index 734bc476c..9a6224b36 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion022.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion022.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Subversion: Search Revisions Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion023.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion023.htm index cdc472140..639383893 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion023.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion023.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Subversion: Search Revisions Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion024.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion024.htm index d8cc3226e..99a3014be 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion024.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion024.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Subversion: Search Revisions Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion025.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion025.htm index 2a2942066..aa69fad6d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion025.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion025.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Subversion: Search Revisions Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion026.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion026.htm index b2bc83b84..3de0418b9 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion026.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion026.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Subversion: Browse Repository Folders Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion027.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion027.htm index 9eb8d215d..e52ed9048 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion027.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion027.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Subversion: Browse Repository Folders Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion028.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion028.htm index 4072d0c33..578baca84 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion028.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion028.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Subversion: Browse Repository Folders Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion029.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion029.htm index 0f9faa42b..08ec080a6 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion029.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion029.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Subversion: Browse Repository Folders Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion030.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion030.htm index a651c1899..ffa32d5f6 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion030.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion030.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Subversion: Browse Repository Folders Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion031.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion031.htm index 17f1d8d60..d85d974be 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion031.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion031.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Subversion: Browse Repository Folders Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion032.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion032.htm index 889f8f2a7..7ebcfe264 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion032.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion032.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Subversion: Browse Repository Folders Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion033.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion033.htm index a08ddf340..8f41d0452 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion033.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion033.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Versioning: Open Projects Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion034.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion034.htm index 28dfb5a65..6218e7caf 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion034.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion034.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Subversion: Select Template Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion035.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion035.htm index 00a984490..f60eb4a30 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion035.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion035.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Subversion: Shelve Changes Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion036.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion036.htm index 4fa383410..9cb649b4b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion036.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion036.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Subversion: Manage Connection Settings Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion037.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion037.htm index ac01fb6cc..555a3658e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion037.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion037.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Subversion: Select Tree To Diff Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_team.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_team.htm index 9ab1ebdbb..d8266bff3 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_team.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_team.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Team Server</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_team001.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_team001.htm index be75575f1..9b734285d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_team001.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_team001.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Team Project Wizard: Name and Licenses</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_team002.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_team002.htm index a3029b717..6258c1d1e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_team002.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_team002.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Team Project Wizard: Source Code and Issues</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_team003.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_team003.htm index 3cc8f95e6..28756d495 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_team003.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_team003.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Team Project Wizard: Summary</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit.htm index 39456a939..aea5a2d6f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Using Unit Test</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit001.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit001.htm index f08029805..560afb48f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit001.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit001.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Select JUnit Version Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit002.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit002.htm index 0dfcfcb38..c7bfa498c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit002.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit002.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Create Tests Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit003.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit003.htm index 42b3787a0..5a823e20e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit003.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit003.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New JUnit Test Wizard: Name and Location</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit004.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit004.htm index 0de16e000..8e272a7c3 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit004.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit004.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New JUnit Test Suite Wizard: Name and Location</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit005.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit005.htm index 24b93c68d..1415e08ba 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit005.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit005.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New TestNG Test Case Wizard: Name and Location</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit006.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit006.htm index 9ab5d05af..dd62c2c37 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit006.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit006.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Test For Existing Class Wizard: Existing Class To Test</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit007.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit007.htm index 80ad8c5a8..87502837f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit007.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit007.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Unit Test Results Window</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps.htm index 519165345..016a21908 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Web Applications</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps001.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps001.htm index 46c108db7..85a3109e4 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps001.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps001.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>web.xml Visual Editor: General</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps002.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps002.htm index 3d39397f8..e648d89d5 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps002.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps002.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>web.xml Visual Editor: Context Parameters</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps003.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps003.htm index 8efdb2d56..9e63fae6b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps003.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps003.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>web.xml Visual Editor: Web Application Listeners</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps004.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps004.htm index 22b4d002e..636806536 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps004.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps004.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>web.xml Visual Editor: Servlets</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps005.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps005.htm index 2c246b3f0..9da1c0336 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps005.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps005.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>web.xml Visual Editor: Servlet Filters</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps006.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps006.htm index f81f6e9e0..0d4e7f2c3 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps006.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps006.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>web.xml Visual Editor: Welcome Files</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps007.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps007.htm index 0477c3391..3715c4464 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps007.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps007.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>web.xml Visual Editor: Error Pages</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps008.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps008.htm index 384641d18..d375d062a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps008.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps008.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>web.xml Visual Editor: JSP Property Groups</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps009.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps009.htm index bf3f6ed28..306581f44 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps009.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps009.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>web.xml Visual Editor: EJB References</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps010.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps010.htm index 46a7085a2..885bb6c3a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps010.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps010.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>web.xml Visual Editor: Environment Entries</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps011.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps011.htm index 1b87f8eee..a6e49f0df 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps011.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps011.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>web.xml Visual Editor: Message Destination References</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps012.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps012.htm index 65ebfd7e7..487eddc4e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps012.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps012.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>web.xml Visual Editor: Resource Environment References</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps013.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps013.htm index 2d742b08a..de08ea3ac 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps013.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps013.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>web.xml Visual Editor: Resource References</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps014.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps014.htm index 13f9262a3..b58e5b8b7 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps014.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps014.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>web.xml Visual Editor: Login Configuration</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps015.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps015.htm index 3bb385f8e..a84445b48 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps015.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps015.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>web.xml Visual Editor: Security Constraints</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps016.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps016.htm index 783a9b891..9598117c1 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps016.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps016.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>web.xml Visual Editor: Security Roles</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps017.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps017.htm index 1abd1835e..77871c846 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps017.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps017.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Cloud Providers Manager</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps018.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps018.htm index 426f0384c..3acf391e0 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps018.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps018.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>HTTP Server-Side Monitor</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps019.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps019.htm index 57396799a..1cb6bc23b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps019.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps019.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Standard Web Project Properties Dialog Box: Frameworks</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps020.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps020.htm index 541e3f5ca..dff0babbe 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps020.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps020.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Standard Web Project Properties Dialog Box: JAX-RPC Web Service Clients</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps021.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps021.htm index 713356eed..3ecd750d3 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps021.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps021.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Standard Web Project Properties Dialog Box: Disabled JAX-RPC Web Service Clients</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps022.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps022.htm index 724d9cd56..6470b9a63 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps022.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps022.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Standard Web Project Properties Dialog Box: JAX-RPC Web Services</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps023.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps023.htm index b152fa86f..234128979 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps023.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps023.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Standard Web Project Properties Dialog Box: Disabled JAX-RPC Web Services</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps024.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps024.htm index d9df499ff..a582a6b1b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps024.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps024.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Standard Web Project Properties Dialog Box: Compiling</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps025.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps025.htm index 825b0d9af..e97524292 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps025.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps025.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Standard Web Project Properties Dialog Box: Documenting</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps026.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps026.htm index ad1ff4255..a42253f4e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps026.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps026.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Standard Web Project Properties Dialog Box: Libraries</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps027.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps027.htm index 47cd7fb66..6903e3d75 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps027.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps027.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Standard Web Project Properties Dialog Box: Run</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps028.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps028.htm index 3c6819431..864d9e0e2 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps028.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps028.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Standard Web Project Properties Dialog Box: Sources</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps029.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps029.htm index e1e22aca0..d49872544 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps029.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps029.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Standard Web Project Properties Dialog Box: Packaging</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps030.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps030.htm index 942589e88..83ecb5a21 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps030.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps030.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Free-Form Project Properties Dialog Box: Web Sources</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps031.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps031.htm index c2ff64ca5..f65f703f4 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps031.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps031.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Free-Form Project Properties Dialog Box: Web Sources Classpath</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps032.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps032.htm index 5e4935fb1..d7ae13c48 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps032.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps032.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>HTTP Authentication dialog box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps033.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps033.htm index 302b3438d..5e70c550a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps033.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps033.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Free-Form Project Wizard: Web Sources Classpath</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps034.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps034.htm index ed25699f6..d3e2d5cd0 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps034.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps034.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Free-Form Project Wizard: Web Sources</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps035.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps035.htm index 3b1469bbf..895ff01ee 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps035.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps035.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>JavaServer Faces Framework Configuration</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps036.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps036.htm index cfafcb959..df3ca77cf 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps036.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps036.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Web Application Wizard: Name and Location</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps037.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps037.htm index 3832963b1..1b5753716 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps037.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps037.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Web Application Wizard: Server and Settings</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps038.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps038.htm index 586f847ea..398291ebf 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps038.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps038.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Web Application Wizard: Frameworks</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps039.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps039.htm index 4b3a4289f..ee5cf2d47 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps039.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps039.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Web Project with Existing Sources Wizard: Server and Settings</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps040.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps040.htm index 899b16ccf..6a8309857 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps040.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps040.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Web Project with Existing Sources Wizard: Existing Sources and Libraries</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps041.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps041.htm index 8b694ab34..ab92bf517 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps041.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps041.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Web Application Wizard: Struts Framework</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps042.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps042.htm index 7d63071d3..4f3dc4058 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps042.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps042.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Web Project with Existing Sources Wizard: Name and Location</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps043.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps043.htm index 815fc372d..b9a2fca30 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps043.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps043.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Servlet Wizard: Name and Location</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps044.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps044.htm index 9e35e73d1..f8080f4ef 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps044.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps044.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Servlet Wizard: Configure Servlet Deployment</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps045.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps045.htm index 8c6e5ba4d..93ebc1fe7 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps045.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps045.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New WebSocket Endpoint Wizard: Create WebSocket Endpoint</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk.htm index 525dd0b7b..d3438845a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Web Frameworks</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk001.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk001.htm index 1bc1ec1d1..72c01ec8c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk001.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk001.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Grails Artifact Wizard</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk002.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk002.htm index 82d5b2eec..8777fcdbf 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk002.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk002.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Grails Application Wizard</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk003.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk003.htm index b69afdf7e..e763e1c74 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk003.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk003.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Add Managed Bean Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk004.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk004.htm index 62b561265..5667ae2d5 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk004.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk004.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Add Navigation Case Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk005.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk005.htm index bed09f236..4c7a43065 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk005.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk005.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Add Navigation Rule Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk006.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk006.htm index 4d52dc442..953743d87 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk006.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk006.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Validation Constraint Wizard: Name and Location</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk007.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk007.htm index 7762c42d3..5312069e2 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk007.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk007.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New JSF Pages from Entity Class Wizard: Entity Classes</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk008.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk008.htm index 5b620cd5d..99196c2d6 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk008.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk008.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New JSF Pages from Entity Class Wizard: Generate JSF Pages and Classes</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk009.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk009.htm index 1260d4782..dd0f4d72b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk009.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk009.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New JSF Managed Bean Wizard: Name and Location</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk010.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk010.htm index 1794924fe..b6ceebf67 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk010.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk010.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Facelets Template Wizard: Name and Location</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk011.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk011.htm index 95632aed6..38eee9020 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk011.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk011.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Facelets Template Client Wizard: Name and Location</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk012.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk012.htm index 461ef8121..9af8c5f3c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk012.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk012.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Select RichFaces Library Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk013.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk013.htm index 51c0cde34..e07eeb3ec 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk013.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk013.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Add Action Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk014.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk014.htm index 890e99f09..d80b11703 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk014.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk014.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Add Exception Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk015.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk015.htm index e4bcd4f6a..4fd21ea19 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk015.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk015.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Add ActionForm Bean Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk016.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk016.htm index aa412f09e..7731150c2 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk016.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk016.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Add ActionForm Bean Property Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk017.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk017.htm index ade21976b..96309919f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk017.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk017.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Add Forward Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk018.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk018.htm index ff2a05821..8642c7e37 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk018.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk018.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Add Forward/Include Action Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk019.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk019.htm index afe6f0dc0..9df077fdd 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk019.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk019.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Struts Action Wizard: Name and Location</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk020.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk020.htm index ce5f2210b..7c5c10a3b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk020.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk020.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Struts Action Wizard: ActionForm Bean, Parameter</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk021.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk021.htm index 756422b07..1d63e6c51 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk021.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk021.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Struts ActionForm Bean Wizard: Name and Location</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans.htm index df14a02a4..a9b01ce3a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Working with NetBeans</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans001.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans001.htm index a7b9be2cc..44f1a7327 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans001.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans001.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Options Window: General</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans002.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans002.htm index f06b7aea0..0fb150f3c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans002.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans002.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Editor Options: General</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans003.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans003.htm index 92c08ea65..7b2748a37 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans003.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans003.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Editor Options: Folding</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans004.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans004.htm index 5c82cfc44..4185615f1 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans004.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans004.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Editor Options: Formatting</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans005.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans005.htm index 3dff1abed..e3a80f882 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans005.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans005.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Editor Options: Code Completion</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans006.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans006.htm index 4c2c5132e..b2b04f81d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans006.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans006.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Editor Options: Code Templates</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans007.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans007.htm index ff6018ad4..56642b7cc 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans007.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans007.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Editor Options: Hints</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans008.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans008.htm index 932ec7939..24ed794d7 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans008.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans008.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Editor Options: Highlighting</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans009.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans009.htm index 31731f501..136f40f82 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans009.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans009.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Editor Options: Macros</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans010.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans010.htm index 692629bc7..0389fa4ab 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans010.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans010.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Editor Options: On Save</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans011.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans011.htm index f41f55d63..b2e5e6016 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans011.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans011.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Editor Options: Spellchecker</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans012.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans012.htm index 30f22fd8f..462298180 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans012.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans012.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Options Window: Fonts and Colors</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans013.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans013.htm index 86e27f8eb..4d6bfdf3e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans013.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans013.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Options Window: Keymap</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans014.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans014.htm index 06c869718..4d54fee72 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans014.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans014.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Manage Keymap Profiles Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans015.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans015.htm index c9404ad36..441d623ed 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans015.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans015.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Options Window: Team: Action Items</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans016.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans016.htm index a734736a3..c4ef72305 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans016.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans016.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Options Window: Miscellaneous: CSS Preprocessors</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans017.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans017.htm index 07d65d422..93a71081f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans017.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans017.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Options Window: Miscellaneous: Diff</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans018.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans018.htm index e8cf62e0c..b4090bccc 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans018.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans018.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Options Window: Miscellaneous: Files</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans019.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans019.htm index 8920c468e..2bb329d2f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans019.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans019.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Options Window: Team: Tasks</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans020.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans020.htm index 8f7efd9d3..f61b031be 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans020.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans020.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Options Window: Miscellaneous: Mobile Platforms</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans021.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans021.htm index 271723e95..01bf97107 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans021.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans021.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Options Window: Miscellaneous: Output</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans022.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans022.htm index fe7803c2a..7206c61e4 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans022.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans022.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Options Window: Miscellaneous: Terminal</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans023.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans023.htm index c47cf1084..3f3167ded 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans023.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans023.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Options Window: Miscellaneous: Versioning</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans024.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans024.htm index edae750a3..541304d03 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans024.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans024.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Options Window: Appearance: Windows</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans025.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans025.htm index 82484965a..1d2ff81ca 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans025.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans025.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Options Window: Appearance: Document Tabs</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans026.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans026.htm index fd7869085..d9f447da5 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans026.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans026.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Options Window: Appearance: Look and Feel</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans027.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans027.htm index 7199c38bf..3e7454ae5 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans027.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans027.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Tasks: Blocks Task Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans028.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans028.htm index e387fd49c..fd6327c11 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans028.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans028.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Tasks: Create Task Repository Dialog Box: Bugzilla</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans029.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans029.htm index f1e832781..53d3d5668 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans029.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans029.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Tasks: Duplicate Task Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans030.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans030.htm index c627bdca0..5b26733c0 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans030.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans030.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Tasks: Task Repository Server Response Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans031.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans031.htm index b4ffdc1b8..e05e1b0cd 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans031.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans031.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Tasks: Task Depends On Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans032.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans032.htm index c6e045560..fbe4ac34b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans032.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans032.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Tasks: Create Task Repository Dialog Box: JIRA</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans033.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans033.htm index b96d01217..3ce7640b0 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans033.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans033.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Tasks: Apply Patch Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans034.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans034.htm index 80bed498f..ea6a7468c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans034.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans034.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Tasks: Resolve Task Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans035.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans035.htm index f58955199..57f2ca2f7 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans035.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans035.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Tasks: Save Query Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans036.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans036.htm index 6f2e2a942..d773c907f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans036.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans036.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Tasks: Select Keyword Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans037.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans037.htm index 932db1784..5f3498f58 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans037.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans037.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Tasks: Modify Templates Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans038.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans038.htm index bf93fbdf7..b80c54204 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans038.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans038.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Plugins Manager: Downloaded</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans039.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans039.htm index 09ae4b76e..0720e71ff 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans039.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans039.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Plugins Manager: Installed</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans040.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans040.htm index 384e51633..0375ba056 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans040.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans040.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Plugins Manager: Available Plugins</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans041.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans041.htm index 4106bd973..6c7f7e13a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans041.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans041.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Plugins Manager: Settings</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans042.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans042.htm index 3d6352e62..028335824 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans042.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans042.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Plugins Manager: Updates</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans043.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans043.htm index 5f218d1cd..ce4bb02af 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans043.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans043.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Customize Toolbars Window</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans044.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans044.htm index 3ab1f9c7a..d6aa40a8d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans044.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans044.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Bookmarks Window</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans045.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans045.htm index 1abce587e..ca0053305 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans045.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans045.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Navigator Window</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans046.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans046.htm index 33714f843..9df9445d1 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans046.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans046.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>General Editor Window</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans047.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans047.htm index e3f4e6dfc..587c671b1 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans047.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans047.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Project Properties: Formatting</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans048.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans048.htm index 2d233b3cf..636e6db33 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans048.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans048.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Add Web Service Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans049.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans049.htm index 722caf46a..122c1783d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans049.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans049.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Documents Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans050.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans050.htm index 3055bcacc..13ff7dc75 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans050.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans050.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Properties Window</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans051.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans051.htm index fc7c349af..dc3f657da 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans051.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans051.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Services Window</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans052.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans052.htm index 9eba69f8a..5c3c3609c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans052.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans052.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Save Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans053.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans053.htm index a770d7069..b3b70d668 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans053.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans053.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Replace in Projects Dialog</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans054.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans054.htm index c8307fa67..5dee624f8 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans054.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans054.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Find in Projects Dialog</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans055.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans055.htm index 0066a4fe1..567042918 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans055.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans055.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Select The Diff Patch Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans056.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans056.htm index c2ddb7139..74e756aec 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans056.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans056.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Action Items Window</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans057.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans057.htm index a40c53757..c02d9002f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans057.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans057.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>HTML and JSP Source Editor</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans058.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans058.htm index 7b0d71648..57151d69a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans058.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans058.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>History View</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans059.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans059.htm index 386f4d82e..4ab460589 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans059.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans059.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Ant Library Manager</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans060.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans060.htm index 99e4982e3..fdfe1e74c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans060.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans060.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Favorites Window</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans061.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans061.htm index 11638513c..09fe57f64 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans061.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans061.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Files Window</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans062.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans062.htm index 552ee854d..39f34774a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans062.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans062.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Project Group: Create New Group Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans063.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans063.htm index 7eaf72c28..7202da626 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans063.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans063.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Projects Window</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans064.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans064.htm index 142673905..4ee471d2f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans064.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans064.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>New Project Wizard: Choose Project</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans065.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans065.htm index 47ba04fe8..52ce88769 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans065.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans065.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Web Browser Window</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans066.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans066.htm index 3e379ed87..6462249cf 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans066.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans066.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Options Window: General: Web Browsers Manager</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans067.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans067.htm index 266c39f21..b07cf0ea7 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans067.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans067.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Shelved Changes Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans068.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans068.htm index 1f7df8065..740c07473 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans068.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans068.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Waiting for Tasks to Finish Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans069.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans069.htm index ee3e8a025..3d1b6b97a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans069.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans069.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Output Window</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans070.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans070.htm index a8fa79a2e..fb6524a97 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans070.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans070.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Login to netbeans.org Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans071.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans071.htm index 9fd651372..c8defcbf1 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans071.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans071.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Using the IDE Help System</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans072.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans072.htm index 4b4407bc8..85b6fc269 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans072.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans072.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Legal Notices</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans073.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans073.htm index 0305785e3..c2ea51dd1 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans073.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans073.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Internationalization Wizard</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans074.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans074.htm index 21cb850aa..38142b8ef 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans074.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans074.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Notifications Window</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans075.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans075.htm index c8b129b00..0b4e9956f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans075.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans075.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Tasks Window</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans076.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans076.htm index faeeb1fb4..febe032c5 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans076.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans076.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Javadoc Index Search Window</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_xml.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_xml.htm index 7a397d532..faeaa906e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_xml.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_xml.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Using XML</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_xml001.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_xml001.htm index fa305e9fa..5e5419618 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_xml001.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_xml001.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>About the XML Source Editor</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_xml002.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_xml002.htm index 95d02fbec..8ab1895fd 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_xml002.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_xml002.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Add Catalog Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_xml003.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_xml003.htm index f6981c347..74089a77c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_xml003.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_xml003.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>XSL Transformation Dialog Box</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_xml004.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_xml004.htm index 82423ad5e..c118e7342 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_xml004.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_xml004.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>XML Editor Toolbar</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/ide-toc.xml b/usersguide/javahelp/org/netbeans/modules/usersguide/ide-toc.xml index 52744643b..65b3f003f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/ide-toc.xml +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/ide-toc.xml @@ -1,10 +1,23 @@ <?xml version='1.0' encoding='ISO-8859-1' ?> <!-- -* Copyright � 1997, 2017, Oracle and/or its affiliates. All rights reserved. -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. -* Use is subject to license terms. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + --> <!DOCTYPE toc diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/ide.css b/usersguide/javahelp/org/netbeans/modules/usersguide/ide.css index 42ff7a663..b7b60b266 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/ide.css +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/ide.css @@ -1,8 +1,19 @@ /* - * rave.css 08/13/2004 + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * Copyright © 1997, 2011, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. * * Changes from NetBeans ide.css: * Oct. 2003 diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/ide.hs b/usersguide/javahelp/org/netbeans/modules/usersguide/ide.hs index fdc9fdbb0..e848dcc5e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/ide.hs +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/ide.hs @@ -1,10 +1,23 @@ <?xml version='1.0' encoding='ISO-8859-1' ?> <!-- -* Copyright (c) 2013, 2017 Oracle and/or its affiliates. All rights reserved. -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. -* Use is subject to license terms. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + --> <!DOCTYPE helpset PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp HelpSet Version 2.0//EN" diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/legal_notice.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/legal_notice.htm index 14fb46410..049a175fb 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/legal_notice.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/legal_notice.htm @@ -3,38 +3,186 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <meta http-equiv="content-type" content="text/html; charset=utf-8" /> -<title>Oracle Legal Notices</title> +<title>Apache Legal Notices</title> <link rel="stylesheet" href="ide.css" type="text/css" /> </head> <body> -<h1>Oracle Legal Notices </h1> -<h3>Copyright Notice </h3> -<p>Copyright © 2017, Oracle and/or its affiliates. All rights reserved. </p> -<h3>Trademark Notice </h3> -<p>Oracle and Java are registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.</p> -<p>Intel and Intel Xeon are trademarks or registered trademarks of Intel Corporation. All SPARC trademarks are used under license and are trademarks or registered trademarks of SPARC International, Inc. AMD, Opteron, the AMD logo, and the AMD Opteron logo are trademarks or registered trademarks of Advanced Micro Devices. UNIX is a registered trademark of The Open Group.</p> -<h3>License Restrictions Warranty/Consequential Damages Disclaimer </h3> -<p>This software and related documentation are provided under a license agreement containing restrictions on use and disclosure and are protected by intellectual property laws. Except as expressly permitted in your license agreement or allowed by law, you may not use, copy, reproduce, translate, broadcast, modify, license, transmit, distribute, exhibit, perform, publish, or display any part, in any form, or by any means. Reverse engineering, disassembly, or decompilation of this software, unless required by law for interoperability, is prohibited.</p> -<p></p> -<h3>Warranty Disclaimer </h3> -<p>The information contained herein is subject to change without notice and is not warranted to be error-free. If you find any errors, please report them to us in writing. </p> -<h3>Restricted Rights Notice </h3> -<p>If this is software or related documentation that is delivered to the U.S. Government or anyone licensing it on behalf of the U.S. Government, the following notice is applicable:</p> -<p>U.S. GOVERNMENT END USERS: Oracle programs, including any operating system, integrated software, any programs installed on the hardware, and/or documentation, delivered to U.S. Government end users are &quot;commercial computer software&quot; pursuant to the applicable Federal Acquisition Regulation and agency-specific supplemental regulations. As such, use, duplication, disclosure, modification, and adaptation of the programs, including any operating system, integrated software, any programs installed on the hardware, and/or documentation, shall be subject to license terms and license restrictions applicable to the programs. No other rights are granted to the U.S. Government.<br /> -</p> -<h3>Hazardous Applications Notice </h3> -<p>This software or hardware is developed for general use in a variety of information management applications. It is not developed or intended for use in any inherently dangerous applications, including applications that may create a risk of personal injury. If you use this software or hardware in dangerous applications, then you shall be responsible to take all appropriate fail-safe, backup, redundancy, and other measures to ensure its safe use. Oracle Corporation and its affiliates disclaim any liability for any damages caused by use of this software or hardware in dangerous applications.<br /> -</p> -<h3>Third-Party Content, Products, and Services Disclaimer </h3> -<p>This software or hardware and documentation may provide access to or information on content, products, and services from third parties. Oracle Corporation and its affiliates are not responsible for and expressly disclaim all warranties of any kind with respect to third-party content, products, and services. Oracle Corporation and its affiliates will not be responsible for any loss, costs, or damages incurred due to your access to or use of third-party content, products, or services.</p> -<h3>Alpha and Beta Draft Documentation Notice </h3> -<p>If this document is in prerelease status:</p> -<p>This documentation is in preproduction status and is intended for demonstration and preliminary use only. It may not be specific to the hardware on which you are using the software. Oracle Corporation and its affiliates are not responsible for and expressly disclaim all warranties of any kind with respect to this documentation and will not be responsible for any loss, costs, or damages incurred due to the use of this documentation.</p> -<p></p> -<h3>Documentation Accessibility </h3> -<p>For information about Oracle's commitment to accessibility, visit the Oracle Accessibility Program website at http://www.oracle.com/pls/topic/lookup?ctx=acc&amp;id=docacc.</p> -<h3>Access to Oracle Support </h3> -<p>Oracle customers have access to electronic support through My Oracle Support. For information, visit <code>http://www.oracle.com/pls/topic/lookup?ctx=acc&amp;id=info</code> or visit <code>http://www.oracle.com/pls/topic/lookup?ctx=acc&amp;id=trs</code> if you are hearing impaired.</p> -<p><img width="144" height="18" src="oracle.gif" alt="Oracle Logo" /></p> +<h1>Apache Legal Notices </h1> +<p>Apache License<br></br>Version 2.0, January 2004<br></br> +<a href="http://www.apache.org/licenses/">http://www.apache.org/licenses/</a> </p> +<p>TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION</p> +<p><strong><a name="definitions">1. Definitions</a></strong>.</p> +<p>"License" shall mean the terms and conditions for use, reproduction, and +distribution as defined by Sections 1 through 9 of this document.</p> +<p>"Licensor" shall mean the copyright owner or entity authorized by the +copyright owner that is granting the License.</p> +<p>"Legal Entity" shall mean the union of the acting entity and all other +entities that control, are controlled by, or are under common control with +that entity. For the purposes of this definition, "control" means (i) the +power, direct or indirect, to cause the direction or management of such +entity, whether by contract or otherwise, or (ii) ownership of fifty +percent (50%) or more of the outstanding shares, or (iii) beneficial +ownership of such entity.</p> +<p>"You" (or "Your") shall mean an individual or Legal Entity exercising +permissions granted by this License.</p> +<p>"Source" form shall mean the preferred form for making modifications, +including but not limited to software source code, documentation source, +and configuration files.</p> +<p>"Object" form shall mean any form resulting from mechanical transformation +or translation of a Source form, including but not limited to compiled +object code, generated documentation, and conversions to other media types.</p> +<p>"Work" shall mean the work of authorship, whether in Source or Object form, +made available under the License, as indicated by a copyright notice that +is included in or attached to the work (an example is provided in the +Appendix below).</p> +<p>"Derivative Works" shall mean any work, whether in Source or Object form, +that is based on (or derived from) the Work and for which the editorial +revisions, annotations, elaborations, or other modifications represent, as +a whole, an original work of authorship. For the purposes of this License, +Derivative Works shall not include works that remain separable from, or +merely link (or bind by name) to the interfaces of, the Work and Derivative +Works thereof.</p> +<p>"Contribution" shall mean any work of authorship, including the original +version of the Work and any modifications or additions to that Work or +Derivative Works thereof, that is intentionally submitted to Licensor for +inclusion in the Work by the copyright owner or by an individual or Legal +Entity authorized to submit on behalf of the copyright owner. For the +purposes of this definition, "submitted" means any form of electronic, +verbal, or written communication sent to the Licensor or its +representatives, including but not limited to communication on electronic +mailing lists, source code control systems, and issue tracking systems that +are managed by, or on behalf of, the Licensor for the purpose of discussing +and improving the Work, but excluding communication that is conspicuously +marked or otherwise designated in writing by the copyright owner as "Not a +Contribution."</p> +<p>"Contributor" shall mean Licensor and any individual or Legal Entity on +behalf of whom a Contribution has been received by Licensor and +subsequently incorporated within the Work.</p> +<p><strong><a name="copyright">2. Grant of Copyright License</a></strong>. Subject to the +terms and conditions of this License, each Contributor hereby grants to You +a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable +copyright license to reproduce, prepare Derivative Works of, publicly +display, publicly perform, sublicense, and distribute the Work and such +Derivative Works in Source or Object form.</p> +<p><strong><a name="patent">3. Grant of Patent License</a></strong>. Subject to the terms +and conditions of this License, each Contributor hereby grants to You a +perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable +(except as stated in this section) patent license to make, have made, use, +offer to sell, sell, import, and otherwise transfer the Work, where such +license applies only to those patent claims licensable by such Contributor +that are necessarily infringed by their Contribution(s) alone or by +combination of their Contribution(s) with the Work to which such +Contribution(s) was submitted. If You institute patent litigation against +any entity (including a cross-claim or counterclaim in a lawsuit) alleging +that the Work or a Contribution incorporated within the Work constitutes +direct or contributory patent infringement, then any patent licenses +granted to You under this License for that Work shall terminate as of the +date such litigation is filed.</p> +<p><strong><a name="redistribution">4. Redistribution</a></strong>. You may reproduce and +distribute copies of the Work or Derivative Works thereof in any medium, +with or without modifications, and in Source or Object form, provided that +You meet the following conditions:</p> +<ol style="list-style: lower-latin;"> +<li>You must give any other recipients of the Work or Derivative Works a +copy of this License; and</li> + +<li>You must cause any modified files to carry prominent notices stating +that You changed the files; and</li> + +<li>You must retain, in the Source form of any Derivative Works that You +distribute, all copyright, patent, trademark, and attribution notices from +the Source form of the Work, excluding those notices that do not pertain to +any part of the Derivative Works; and</li> + +<li>If the Work includes a "NOTICE" text file as part of its distribution, +then any Derivative Works that You distribute must include a readable copy +of the attribution notices contained within such NOTICE file, excluding +those notices that do not pertain to any part of the Derivative Works, in +at least one of the following places: within a NOTICE text file distributed +as part of the Derivative Works; within the Source form or documentation, +if provided along with the Derivative Works; or, within a display generated +by the Derivative Works, if and wherever such third-party notices normally +appear. The contents of the NOTICE file are for informational purposes only +and do not modify the License. You may add Your own attribution notices +within Derivative Works that You distribute, alongside or as an addendum to +the NOTICE text from the Work, provided that such additional attribution +notices cannot be construed as modifying the License. +<br/> +<br/> +You may add Your own copyright statement to Your modifications and may +provide additional or different license terms and conditions for use, +reproduction, or distribution of Your modifications, or for any such +Derivative Works as a whole, provided Your use, reproduction, and +distribution of the Work otherwise complies with the conditions stated in +this License. +</li> + +</ol> + +<p><strong><a name="contributions">5. Submission of Contributions</a></strong>. Unless You +explicitly state otherwise, any Contribution intentionally submitted for +inclusion in the Work by You to the Licensor shall be under the terms and +conditions of this License, without any additional terms or conditions. +Notwithstanding the above, nothing herein shall supersede or modify the +terms of any separate license agreement you may have executed with Licensor +regarding such Contributions.</p> +<p><strong><a name="trademarks">6. Trademarks</a></strong>. This License does not grant +permission to use the trade names, trademarks, service marks, or product +names of the Licensor, except as required for reasonable and customary use +in describing the origin of the Work and reproducing the content of the +NOTICE file.</p> +<p><strong><a name="no-warranty">7. Disclaimer of Warranty</a></strong>. Unless required by +applicable law or agreed to in writing, Licensor provides the Work (and +each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT +WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, +without limitation, any warranties or conditions of TITLE, +NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You +are solely responsible for determining the appropriateness of using or +redistributing the Work and assume any risks associated with Your exercise +of permissions under this License.</p> +<p><strong><a name="no-liability">8. Limitation of Liability</a></strong>. In no event and +under no legal theory, whether in tort (including negligence), contract, or +otherwise, unless required by applicable law (such as deliberate and +grossly negligent acts) or agreed to in writing, shall any Contributor be +liable to You for damages, including any direct, indirect, special, +incidental, or consequential damages of any character arising as a result +of this License or out of the use or inability to use the Work (including +but not limited to damages for loss of goodwill, work stoppage, computer +failure or malfunction, or any and all other commercial damages or losses), +even if such Contributor has been advised of the possibility of such +damages.</p> +<p><strong><a name="additional">9. Accepting Warranty or Additional Liability</a></strong>. +While redistributing the Work or Derivative Works thereof, You may choose +to offer, and charge a fee for, acceptance of support, warranty, indemnity, +or other liability obligations and/or rights consistent with this License. +However, in accepting such obligations, You may act only on Your own behalf +and on Your sole responsibility, not on behalf of any other Contributor, +and only if You agree to indemnify, defend, and hold each Contributor +harmless for any liability incurred by, or claims asserted against, such +Contributor by reason of your accepting any such warranty or additional +liability.</p> +<p>END OF TERMS AND CONDITIONS</p> +<h1 id="apply">APPENDIX: How to apply the Apache License to your work<a class="headerlink" href="#apply" title="Permanent link">&para;</a></h1> +<p>To apply the Apache License to your work, attach the following boilerplate +notice, with the fields enclosed by brackets "[]" replaced with your own +identifying information. (Don't include the brackets!) The text should be +enclosed in the appropriate comment syntax for the file format. We also +recommend that a file or class name and description of purpose be included +on the same "printed page" as the copyright notice for easier +identification within third-party archives.</p> +<div class="codehilite"><pre>Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the &quot;License&quot;); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an &quot;AS IS&quot; BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +</pre></div></div> </body> </html> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/map.xml b/usersguide/javahelp/org/netbeans/modules/usersguide/map.xml index 0fee99807..65323eec7 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/map.xml +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/map.xml @@ -1,4 +1,24 @@ <?xml version='1.0' encoding='utf-8'?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <map version="2.0"> <mapID target="titlehelp.htm" url="titlehelp.htm" /> <!-- "NetBeans IDE Online Help"--> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/prefacehelp.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/prefacehelp.htm index 35d09e4c9..c32c49c9d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/prefacehelp.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/prefacehelp.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>Preface</title> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/titlehelp.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/titlehelp.htm index d259b4216..ec54fa931 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/titlehelp.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/titlehelp.htm @@ -1,5 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> <head> <title>NetBeans IDE Online Help</title> diff --git a/usersguide/l10n.list b/usersguide/l10n.list index ce9162167..8a8561d7a 100644 --- a/usersguide/l10n.list +++ b/usersguide/l10n.list @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# # usersguide read global ${l10n-module}/pdf_source/shortcuts.sxw diff --git a/utilities/l10n.list b/utilities/l10n.list index eaa1f6417..7e25a334b 100644 --- a/utilities/l10n.list +++ b/utilities/l10n.list @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# # utilities read global ${l10n-module}/src/org/netbeans/modules/openfile/*.gif diff --git a/versioning.core/l10n.list b/versioning.core/l10n.list index a2e9072f6..0e6edd8ae 100644 --- a/versioning.core/l10n.list +++ b/versioning.core/l10n.list @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# # versioncontrol read global ${l10n-module}/src/org/netbeans/modules/versioning/diff/*.png diff --git a/versioning.ui/l10n.list b/versioning.ui/l10n.list index a2e9072f6..0e6edd8ae 100644 --- a/versioning.ui/l10n.list +++ b/versioning.ui/l10n.list @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# # versioncontrol read global ${l10n-module}/src/org/netbeans/modules/versioning/diff/*.png diff --git a/versioning/l10n.list b/versioning/l10n.list index a2e9072f6..0e6edd8ae 100644 --- a/versioning/l10n.list +++ b/versioning/l10n.list @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# # versioncontrol read global ${l10n-module}/src/org/netbeans/modules/versioning/diff/*.png diff --git a/welcome/l10n.list b/welcome/l10n.list index 90d947456..5b49a4595 100644 --- a/welcome/l10n.list +++ b/welcome/l10n.list @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# # diff read global ${l10n-module}/release/docs/images/*.png diff --git a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/AXIModelExTest.java b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/AXIModelExTest.java index c92e34eab..4e2627680 100644 --- a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/AXIModelExTest.java +++ b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/AXIModelExTest.java @@ -52,7 +52,9 @@ public AXIModelExTest(String testName) { } public static Test suite() { - TestSuite suite = new TestSuite(AXIModelExTest.class); + TestSuite suite = new TestSuite(); +// Disabled as referenced XSD file were partly not donated by oracle to apache +// suite.addTestSuite(AXIModelExTest.class); return suite; } diff --git a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/AXIModelPerfTest.java b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/AXIModelPerfTest.java index 01b37fd3b..067e2177c 100644 --- a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/AXIModelPerfTest.java +++ b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/AXIModelPerfTest.java @@ -47,8 +47,9 @@ public AXIModelPerfTest(String testName) { } public static Test suite() { - TestSuite suite = new TestSuite(AXIModelPerfTest.class); - + TestSuite suite = new TestSuite(); +// Disabled as referenced XSD file were partly not donated by oracle to apache +// suite.addTestSuite(AXIModelPerfTest.class); return suite; } diff --git a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/AXIModelTest.java b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/AXIModelTest.java index 3a0d74471..875fa173b 100644 --- a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/AXIModelTest.java +++ b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/AXIModelTest.java @@ -57,11 +57,12 @@ public AXIModelTest(String testName, String schemaFile, String elementName) { public static Test suite() { TestSuite suite = new TestSuite(); - suite.addTest(new AXIModelTest("testAXIModel")); - suite.addTest(new AXIModelTest("testAXIModelForMetaSchema")); - suite.addTest(new AXIModelTest("testRecursiveResolve1")); - suite.addTest(new AXIModelTest("testRecursiveResolve2")); - suite.addTest(new AXIModelTest("testSubstitutionGroup")); +// Disabled as referenced XSD file were partly not donated by oracle to apache +// suite.addTest(new AXIModelTest("testAXIModel")); +// suite.addTest(new AXIModelTest("testAXIModelForMetaSchema")); +// suite.addTest(new AXIModelTest("testRecursiveResolve1")); +// suite.addTest(new AXIModelTest("testRecursiveResolve2")); +// suite.addTest(new AXIModelTest("testSubstitutionGroup")); return suite; } diff --git a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/CheckParentTest.java b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/CheckParentTest.java index 4777ae243..113f90fe7 100644 --- a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/CheckParentTest.java +++ b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/CheckParentTest.java @@ -37,7 +37,9 @@ public CheckParentTest(String testName) { } public static Test suite() { - TestSuite suite = new TestSuite(CheckParentTest.class); + TestSuite suite = new TestSuite(); +// Disabled as referenced XSD file were partly not donated by oracle to apache +// suite.addTestSuite(CheckParentTest.class); return suite; } diff --git a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/ContentModelTest.java b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/ContentModelTest.java index acdc6f8da..5c70c308f 100644 --- a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/ContentModelTest.java +++ b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/ContentModelTest.java @@ -37,7 +37,9 @@ public ContentModelTest(String testName) { } public static Test suite() { - TestSuite suite = new TestSuite(ContentModelTest.class); + TestSuite suite = new TestSuite(); +// Disabled as referenced XSD file were partly not donated by oracle to apache +// suite.addTestSuite(ContentModelTest.class); return suite; } diff --git a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/ProxyComponentTest.java b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/ProxyComponentTest.java index 276e50448..230d3d000 100644 --- a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/ProxyComponentTest.java +++ b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/ProxyComponentTest.java @@ -39,7 +39,9 @@ public ProxyComponentTest(String testName) { } public static Test suite() { - TestSuite suite = new TestSuite(ProxyComponentTest.class); + TestSuite suite = new TestSuite(); +// Disabled as referenced XSD file were partly not donated by oracle to apache +// suite.addTestSuite(ProxyComponentTest.class); return suite; } diff --git a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/SchemaGeneratorDatatypesTest.java b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/SchemaGeneratorDatatypesTest.java index 38fe94233..b455e8376 100644 --- a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/SchemaGeneratorDatatypesTest.java +++ b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/SchemaGeneratorDatatypesTest.java @@ -46,8 +46,9 @@ protected void setUp() throws Exception { } public static Test suite() { - TestSuite suite = new TestSuite(SchemaGeneratorDatatypesTest.class); - + TestSuite suite = new TestSuite(); +// Disabled as referenced XSD file were partly not donated by oracle to apache +// suite.addTestSuite(SchemaGeneratorDatatypesTest.class); return suite; } diff --git a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/SchemaTransformTest.java b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/SchemaTransformTest.java index a7d49a48f..a2c92b457 100644 --- a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/SchemaTransformTest.java +++ b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/SchemaTransformTest.java @@ -78,13 +78,16 @@ public static Test suite() { suite.addTest(new SchemaTransformTest("testLineSalamiSlice")); suite.addTest(new SchemaTransformTest("testLineVenetianBlind")); suite.addTest(new SchemaTransformTest("testLineRussianDoll")); - suite.addTest(new SchemaTransformTest("testTypes")); +// Disabled as referenced XSD file were partly not donated by oracle to apache +// suite.addTest(new SchemaTransformTest("testTypes")); //FIXME suite.addTest(new SchemaTransformTest("testLoanApp")); suite.addTest(new SchemaTransformTest("testAnnotation")); - suite.addTest(new SchemaTransformTest("testPurchaseOrder")); +// Disabled as referenced XSD file were partly not donated by oracle to apache +// suite.addTest(new SchemaTransformTest("testPurchaseOrder")); //FIXME suite.addTest(new SchemaTransformTest("testDiscardTransform")); suite.addTest(new SchemaTransformTest("testRenameAfterTransform")); - suite.addTest(new SchemaTransformTest("testNewApproach")); +// Disabled as referenced XSD file were partly not donated by oracle to apache +// suite.addTest(new SchemaTransformTest("testNewApproach")); suite.addTest(new SchemaTransformTest("testMultiSchemaInclude")); suite.addTest(new SchemaTransformTest("testMultiSchemaImport")); suite.addTest(new SchemaTransformTest("testGlobalElementReuse")); @@ -533,7 +536,7 @@ public void testTypes() { assertTrue("Should not be here", false); } validateSchema(axiModel.getSchemaModel()); - + // printDocument(); assertEquals("global complex types",0,getSchemaModel().getSchema().getComplexTypes().size()); assertEquals("global simple types",0,getSchemaModel().getSchema().getSimpleTypes().size()); @@ -801,7 +804,7 @@ public void testNewApproach() { assertTrue("Should not be here", false); } validateSchema(axiModel.getSchemaModel()); - + // printDocument(); assertEquals("global complex types",3,getSchemaModel().getSchema().getComplexTypes().size()); // assertEquals("global simple types",2,getSchemaModel().getSchema().getSimpleTypes().size()); diff --git a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/datatype/DatatypeFactoryTest.java b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/datatype/DatatypeFactoryTest.java index 5751126bd..f71ba0bf0 100644 --- a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/datatype/DatatypeFactoryTest.java +++ b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/datatype/DatatypeFactoryTest.java @@ -52,8 +52,9 @@ protected void setUp() throws Exception { } public static Test suite() { - TestSuite suite = new TestSuite(DatatypeFactoryTest.class); - + TestSuite suite = new TestSuite(); +// Disabled as referenced XSD file were partly not donated by oracle to apache +// suite.addTestSuite(DatatypeFactoryTest.class); return suite; } diff --git a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/datatype/DatatypePerfTest.java b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/datatype/DatatypePerfTest.java index 8d025c11a..7916cad19 100644 --- a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/datatype/DatatypePerfTest.java +++ b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/datatype/DatatypePerfTest.java @@ -47,8 +47,9 @@ protected void setUp() throws Exception { } public static Test suite() { - TestSuite suite = new TestSuite(DatatypePerfTest.class); - + TestSuite suite = new TestSuite(); +// Disabled as referenced XSD file were partly not donated by oracle to apache +// suite.addTestSuite(DatatypePerfTest.class); return suite; } diff --git a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/datatype/DatatypeTest.java b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/datatype/DatatypeTest.java index d6a0436ff..c1e793ba9 100644 --- a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/datatype/DatatypeTest.java +++ b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/datatype/DatatypeTest.java @@ -50,8 +50,9 @@ protected void setUp() throws Exception { public static Test suite() { TestSuite suite = new TestSuite(); - suite.addTest(new DatatypeTest("testDatatypeEnumerations")); - suite.addTest(new DatatypeTest("testCreateDatatype")); +// Disabled as referenced XSD file were partly not donated by oracle to apache +// suite.addTest(new DatatypeTest("testDatatypeEnumerations")); +// suite.addTest(new DatatypeTest("testCreateDatatype")); return suite; } diff --git a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/sync/MultiFileSyncTest.java b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/sync/MultiFileSyncTest.java index 512fb4236..3e6e83f76 100644 --- a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/sync/MultiFileSyncTest.java +++ b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/sync/MultiFileSyncTest.java @@ -59,7 +59,9 @@ public MultiFileSyncTest(String testName) { } public static Test suite() { - TestSuite suite = new TestSuite(MultiFileSyncTest.class); + TestSuite suite = new TestSuite(); +// Disabled as referenced XSD file were partly not donated by oracle to apache +// suite.addTestSuite(MultiFileSyncTest.class); return suite; } diff --git a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/sync/StateChangeTest.java b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/sync/StateChangeTest.java index 84cf79ff7..0152c56ce 100644 --- a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/sync/StateChangeTest.java +++ b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/sync/StateChangeTest.java @@ -66,7 +66,9 @@ protected void setUp() throws Exception { } public static Test suite() { - TestSuite suite = new TestSuite(StateChangeTest.class); + TestSuite suite = new TestSuite(); +// Disabled as referenced XSD file were partly not donated by oracle to apache +// suite.addTestSuite(StateChangeTest.class); return suite; } diff --git a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/sync/SyncDeadlockTest.java b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/sync/SyncDeadlockTest.java index 927a167ec..87b7b0c1c 100644 --- a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/sync/SyncDeadlockTest.java +++ b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/sync/SyncDeadlockTest.java @@ -48,7 +48,9 @@ public SyncDeadlockTest(String testName) { } public static Test suite() { - TestSuite suite = new TestSuite(SyncDeadlockTest.class); + TestSuite suite = new TestSuite(); +// Disabled as referenced XSD file were partly not donated by oracle to apache +// suite.addTestSuite(SyncDeadlockTest.class); return suite; } diff --git a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/sync/SyncElementTest.java b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/sync/SyncElementTest.java index 2710047be..ee644a1f5 100644 --- a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/sync/SyncElementTest.java +++ b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/sync/SyncElementTest.java @@ -70,16 +70,17 @@ public SyncElementTest(String testName) { public static Test suite() { TestSuite suite = new TestSuite(); - suite.addTest(new SyncElementTest("testRemoveElementFromType")); - suite.addTest(new SyncElementTest("testRemoveAttributeFromAttrGroup")); - suite.addTest(new SyncElementTest("testChangeType")); - suite.addTest(new SyncElementTest("testChangeAttributeRef")); - suite.addTest(new SyncElementTest("testChangeTypeContent")); - suite.addTest(new SyncElementTest("testChangeNameOfElement")); - suite.addTest(new SyncElementTest("testRemoveGlobalElement")); - suite.addTest(new SyncElementTest("testAddGlobalElement")); - suite.addTest(new SyncElementTest("testChangeElementRef")); - suite.addTest(new SyncElementTest("testChangeBase")); +// Disabled as referenced XSD file were partly not donated by oracle to apache +// suite.addTest(new SyncElementTest("testRemoveElementFromType")); +// suite.addTest(new SyncElementTest("testRemoveAttributeFromAttrGroup")); +// suite.addTest(new SyncElementTest("testChangeType")); +// suite.addTest(new SyncElementTest("testChangeAttributeRef")); +// suite.addTest(new SyncElementTest("testChangeTypeContent")); +// suite.addTest(new SyncElementTest("testChangeNameOfElement")); +// suite.addTest(new SyncElementTest("testRemoveGlobalElement")); +// suite.addTest(new SyncElementTest("testAddGlobalElement")); +// suite.addTest(new SyncElementTest("testChangeElementRef")); +// suite.addTest(new SyncElementTest("testChangeBase")); return suite; } diff --git a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/sync/SyncTest.java b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/sync/SyncTest.java index d608ac5a1..340dbee80 100644 --- a/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/sync/SyncTest.java +++ b/xml.axi/test/unit/src/org/netbeans/modules/xml/axi/sync/SyncTest.java @@ -50,9 +50,10 @@ public SyncTest(String testName) { public static Test suite() { TestSuite suite = new TestSuite(); - suite.addTest(new SyncTest("testSync")); - suite.addTest(new SyncTest("testOTASyncPerformance")); - //suite.addTest(new SyncPerfTest("testHealthcareSchemaSyncPerformance")); +// Disabled as referenced XSD file were partly not donated by oracle to apache +// suite.addTest(new SyncTest("testSync")); +// suite.addTest(new SyncTest("testOTASyncPerformance")); +// //suite.addTest(new SyncPerfTest("testHealthcareSchemaSyncPerformance")); return suite; } diff --git a/xml.catalog/build.xml b/xml.catalog/build.xml index 73da4f6f1..5c1bf5bad 100644 --- a/xml.catalog/build.xml +++ b/xml.catalog/build.xml @@ -22,7 +22,5 @@ <project name="xml.catalog" default="netbeans" basedir="."> <import file="../nbbuild/templates/projectized.xml"/> - <target name="build-init" depends="projectized.build-init"> - <unzip src="external/xml-catalog-external-resources.zip" dest="src/org/netbeans/modules/xml/catalog/resources"/> - </target> + </project> diff --git a/xml.catalog/external/binaries-list b/xml.catalog/external/binaries-list deleted file mode 100644 index c56e52265..000000000 --- a/xml.catalog/external/binaries-list +++ /dev/null @@ -1,17 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -52C8264EBDCB2782BA610463196832DC377814C3 xml-catalog-external-resources.zip diff --git a/xml.catalog/external/xml-catalog-resources-license.txt b/xml.catalog/external/xml-catalog-resources-license.txt deleted file mode 100644 index 4a344ab54..000000000 --- a/xml.catalog/external/xml-catalog-resources-license.txt +++ /dev/null @@ -1 +0,0 @@ -https://www.w3.org/Consortium/Legal/2015/copyright-software-and-document diff --git a/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/XMLNamespace.xsd b/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/XMLNamespace.xsd new file mode 100644 index 000000000..3dd72c104 --- /dev/null +++ b/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/XMLNamespace.xsd @@ -0,0 +1,334 @@ +<?xml version='1.0'?> +<!-- + +W3C Software and Document Notice and License + +This work is being provided by the copyright holders under the following license. + +License + +By obtaining and/or copying this work, you (the licensee) agree that you have +read, understood, and will comply with the following terms and conditions. + +Permission to copy, modify, and distribute this work, with or without +modification, for any purpose and without fee or royalty is hereby granted, +provided that you include the following on ALL copies of the work or portions +thereof, including modifications: + +- The full text of this NOTICE in a location viewable to users of the + redistributed or derivative work. +- Any pre-existing intellectual property disclaimers, notices, or terms and + conditions. If none exist, the W3C Software and Document Short Notice should + be included. +- Notice of any changes or modifications, through a copyright statement on the + new code or document such as "This software or document includes material + copied from or derived from [title and URI of the W3C document]. + Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)." + +Disclaimers + +THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR + WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF +MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE +SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, +TRADEMARKS OR OTHER RIGHTS. + +COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT. + +The name and trademarks of copyright holders may NOT be used in advertising or +publicity pertaining to the work without specific, written prior permission. +Title to copyright in this work will at all times remain with copyright +holders. + +Changes: + +- Added license header + +--> +<?xml-stylesheet href="../2008/09/xsd.xsl" type="text/xsl"?> +<xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace" + xmlns:xs="http://www.w3.org/2001/XMLSchema" + xmlns ="http://www.w3.org/1999/xhtml" + xml:lang="en"> + + <xs:annotation> + <xs:documentation> + <div> + <h1>About the XML namespace</h1> + + <div class="bodytext"> + <p> + This schema document describes the XML namespace, in a form + suitable for import by other schema documents. + </p> + <p> + See <a href="http://www.w3.org/XML/1998/namespace.html"> + http://www.w3.org/XML/1998/namespace.html</a> and + <a href="http://www.w3.org/TR/REC-xml"> + http://www.w3.org/TR/REC-xml</a> for information + about this namespace. + </p> + <p> + Note that local names in this namespace are intended to be + defined only by the World Wide Web Consortium or its subgroups. + The names currently defined in this namespace are listed below. + They should not be used with conflicting semantics by any Working + Group, specification, or document instance. + </p> + <p> + See further below in this document for more information about <a + href="#usage">how to refer to this schema document from your own + XSD schema documents</a> and about <a href="#nsversioning">the + namespace-versioning policy governing this schema document</a>. + </p> + </div> + </div> + </xs:documentation> + </xs:annotation> + + <xs:attribute name="lang"> + <xs:annotation> + <xs:documentation> + <div> + + <h3>lang (as an attribute name)</h3> + <p> + denotes an attribute whose value + is a language code for the natural language of the content of + any element; its value is inherited. This name is reserved + by virtue of its definition in the XML specification.</p> + + </div> + <div> + <h4>Notes</h4> + <p> + Attempting to install the relevant ISO 2- and 3-letter + codes as the enumerated possible values is probably never + going to be a realistic possibility. + </p> + <p> + See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt"> + http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a> + and the IANA language subtag registry at + <a href="http://www.iana.org/assignments/language-subtag-registry"> + http://www.iana.org/assignments/language-subtag-registry</a> + for further information. + </p> + <p> + The union allows for the 'un-declaration' of xml:lang with + the empty string. + </p> + </div> + </xs:documentation> + </xs:annotation> + <xs:simpleType> + <xs:union memberTypes="xs:language"> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:enumeration value=""/> + </xs:restriction> + </xs:simpleType> + </xs:union> + </xs:simpleType> + </xs:attribute> + + <xs:attribute name="space"> + <xs:annotation> + <xs:documentation> + <div> + + <h3>space (as an attribute name)</h3> + <p> + denotes an attribute whose + value is a keyword indicating what whitespace processing + discipline is intended for the content of the element; its + value is inherited. This name is reserved by virtue of its + definition in the XML specification.</p> + + </div> + </xs:documentation> + </xs:annotation> + <xs:simpleType> + <xs:restriction base="xs:NCName"> + <xs:enumeration value="default"/> + <xs:enumeration value="preserve"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + + <xs:attribute name="base" type="xs:anyURI"> <xs:annotation> + <xs:documentation> + <div> + + <h3>base (as an attribute name)</h3> + <p> + denotes an attribute whose value + provides a URI to be used as the base for interpreting any + relative URIs in the scope of the element on which it + appears; its value is inherited. This name is reserved + by virtue of its definition in the XML Base specification.</p> + + <p> + See <a + href="http://www.w3.org/TR/xmlbase/">http://www.w3.org/TR/xmlbase/</a> + for information about this attribute. + </p> + </div> + </xs:documentation> + </xs:annotation> + </xs:attribute> + + <xs:attribute name="id" type="xs:ID"> + <xs:annotation> + <xs:documentation> + <div> + + <h3>id (as an attribute name)</h3> + <p> + denotes an attribute whose value + should be interpreted as if declared to be of type ID. + This name is reserved by virtue of its definition in the + xml:id specification.</p> + + <p> + See <a + href="http://www.w3.org/TR/xml-id/">http://www.w3.org/TR/xml-id/</a> + for information about this attribute. + </p> + </div> + </xs:documentation> + </xs:annotation> + </xs:attribute> + + <xs:attributeGroup name="specialAttrs"> + <xs:attribute ref="xml:base"/> + <xs:attribute ref="xml:lang"/> + <xs:attribute ref="xml:space"/> + <xs:attribute ref="xml:id"/> + </xs:attributeGroup> + + <xs:annotation> + <xs:documentation> + <div> + + <h3>Father (in any context at all)</h3> + + <div class="bodytext"> + <p> + denotes Jon Bosak, the chair of + the original XML Working Group. This name is reserved by + the following decision of the W3C XML Plenary and + XML Coordination groups: + </p> + <blockquote> + <p> + In appreciation for his vision, leadership and + dedication the W3C XML Plenary on this 10th day of + February, 2000, reserves for Jon Bosak in perpetuity + the XML name "xml:Father". + </p> + </blockquote> + </div> + </div> + </xs:documentation> + </xs:annotation> + + <xs:annotation> + <xs:documentation> + <div xml:id="usage" id="usage"> + <h2><a name="usage">About this schema document</a></h2> + + <div class="bodytext"> + <p> + This schema defines attributes and an attribute group suitable + for use by schemas wishing to allow <code>xml:base</code>, + <code>xml:lang</code>, <code>xml:space</code> or + <code>xml:id</code> attributes on elements they define. + </p> + <p> + To enable this, such a schema must import this schema for + the XML namespace, e.g. as follows: + </p> + <pre> + &lt;schema . . .> + . . . + &lt;import namespace="http://www.w3.org/XML/1998/namespace" + schemaLocation="http://www.w3.org/2001/xml.xsd"/> + </pre> + <p> + or + </p> + <pre> + &lt;import namespace="http://www.w3.org/XML/1998/namespace" + schemaLocation="http://www.w3.org/2009/01/xml.xsd"/> + </pre> + <p> + Subsequently, qualified reference to any of the attributes or the + group defined below will have the desired effect, e.g. + </p> + <pre> + &lt;type . . .> + . . . + &lt;attributeGroup ref="xml:specialAttrs"/> + </pre> + <p> + will define a type which will schema-validate an instance element + with any of those attributes. + </p> + </div> + </div> + </xs:documentation> + </xs:annotation> + + <xs:annotation> + <xs:documentation> + <div id="nsversioning" xml:id="nsversioning"> + <h2><a name="nsversioning">Versioning policy for this schema document</a></h2> + <div class="bodytext"> + <p> + In keeping with the XML Schema WG's standard versioning + policy, this schema document will persist at + <a href="http://www.w3.org/2009/01/xml.xsd"> + http://www.w3.org/2009/01/xml.xsd</a>. + </p> + <p> + At the date of issue it can also be found at + <a href="http://www.w3.org/2001/xml.xsd"> + http://www.w3.org/2001/xml.xsd</a>. + </p> + <p> + The schema document at that URI may however change in the future, + in order to remain compatible with the latest version of XML + Schema itself, or with the XML namespace itself. In other words, + if the XML Schema or XML namespaces change, the version of this + document at <a href="http://www.w3.org/2001/xml.xsd"> + http://www.w3.org/2001/xml.xsd + </a> + will change accordingly; the version at + <a href="http://www.w3.org/2009/01/xml.xsd"> + http://www.w3.org/2009/01/xml.xsd + </a> + will not change. + </p> + <p> + Previous dated (and unchanging) versions of this schema + document are at: + </p> + <ul> + <li><a href="http://www.w3.org/2009/01/xml.xsd"> + http://www.w3.org/2009/01/xml.xsd</a></li> + <li><a href="http://www.w3.org/2007/08/xml.xsd"> + http://www.w3.org/2007/08/xml.xsd</a></li> + <li><a href="http://www.w3.org/2004/10/xml.xsd"> + http://www.w3.org/2004/10/xml.xsd</a></li> + <li><a href="http://www.w3.org/2001/03/xml.xsd"> + http://www.w3.org/2001/03/xml.xsd</a></li> + </ul> + </div> + </div> + </xs:documentation> + </xs:annotation> + +</xs:schema> + diff --git a/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/XMLSchema-instance.xsd b/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/XMLSchema-instance.xsd new file mode 100644 index 000000000..7afdcdf0b --- /dev/null +++ b/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/XMLSchema-instance.xsd @@ -0,0 +1,84 @@ +<?xml version='1.0'?> +<!-- + +W3C Software and Document Notice and License + +This work is being provided by the copyright holders under the following license. + +License + +By obtaining and/or copying this work, you (the licensee) agree that you have +read, understood, and will comply with the following terms and conditions. + +Permission to copy, modify, and distribute this work, with or without +modification, for any purpose and without fee or royalty is hereby granted, +provided that you include the following on ALL copies of the work or portions +thereof, including modifications: + +- The full text of this NOTICE in a location viewable to users of the + redistributed or derivative work. +- Any pre-existing intellectual property disclaimers, notices, or terms and + conditions. If none exist, the W3C Software and Document Short Notice should + be included. +- Notice of any changes or modifications, through a copyright statement on the + new code or document such as "This software or document includes material + copied from or derived from [title and URI of the W3C document]. + Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)." + +Disclaimers + +THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR + WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF +MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE +SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, +TRADEMARKS OR OTHER RIGHTS. + +COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT. + +The name and trademarks of copyright holders may NOT be used in advertising or +publicity pertaining to the work without specific, written prior permission. +Title to copyright in this work will at all times remain with copyright +holders. + +Changes: + +- Added license header + +--> +<!DOCTYPE xs:schema SYSTEM "XMLSchema.dtd" [ +<!ELEMENT p ANY> +<!ELEMENT a ANY> +<!ATTLIST a href CDATA #IMPLIED> +<!ELEMENT hr ANY> +<!ELEMENT h1 ANY> +<!ELEMENT br ANY> +]> +<xs:schema targetNamespace="http://www.w3.org/2001/XMLSchema-instance" + xmlns:xs="http://www.w3.org/2001/XMLSchema" + xmlns="http://www.w3.org/1999/xhtml"> + <xs:annotation> + <xs:documentation> + <h1>XML Schema instance namespace</h1> + <p>See <a href="http://www.w3.org/TR/xmlschema-1/">the XML Schema + Recommendation</a> for an introduction</p> + + + <hr /> + $Date: 2001/03/16 20:25:57 $<br /> + $Id: XMLSchema-instance.xsd,v 1.4 2001/03/16 20:25:57 ht Exp $ + </xs:documentation> + </xs:annotation> + <xs:annotation> + <xs:documentation><p>This schema should never be used as such: + <a href="http://www.w3.org/TR/xmlschema-1/#no-xsi">the XML + Schema Recommendation</a> forbids the declaration of + attributes in this namespace</p> + </xs:documentation> + </xs:annotation> + + <xs:attribute name="nil"/> + <xs:attribute name="type"/> + <xs:attribute name="schemaLocation"/> + <xs:attribute name="noNamespaceSchemaLocation"/> +</xs:schema> diff --git a/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/XMLSchema.dtd b/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/XMLSchema.dtd new file mode 100644 index 000000000..8b3a72687 --- /dev/null +++ b/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/XMLSchema.dtd @@ -0,0 +1,449 @@ +<!-- + +W3C Software and Document Notice and License + +This work is being provided by the copyright holders under the following license. + +License + +By obtaining and/or copying this work, you (the licensee) agree that you have +read, understood, and will comply with the following terms and conditions. + +Permission to copy, modify, and distribute this work, with or without +modification, for any purpose and without fee or royalty is hereby granted, +provided that you include the following on ALL copies of the work or portions +thereof, including modifications: + +- The full text of this NOTICE in a location viewable to users of the + redistributed or derivative work. +- Any pre-existing intellectual property disclaimers, notices, or terms and + conditions. If none exist, the W3C Software and Document Short Notice should + be included. +- Notice of any changes or modifications, through a copyright statement on the + new code or document such as "This software or document includes material + copied from or derived from [title and URI of the W3C document]. + Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)." + +Disclaimers + +THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR + WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF +MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE +SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, +TRADEMARKS OR OTHER RIGHTS. + +COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT. + +The name and trademarks of copyright holders may NOT be used in advertising or +publicity pertaining to the work without specific, written prior permission. +Title to copyright in this work will at all times remain with copyright +holders. + +Changes: + +- Added license header + +--> +<!-- DTD for XML Schemas: Part 1: Structures + Public Identifier: "-//W3C//DTD XMLSCHEMA 200102//EN" + Official Location: http://www.w3.org/2001/XMLSchema.dtd --> +<!-- $Id$ --> +<!-- Note this DTD is NOT normative, or even definitive. --> <!--d--> +<!-- prose copy in the structures REC is the definitive version --> <!--d--> +<!-- (which shouldn't differ from this one except for this --> <!--d--> +<!-- comment and entity expansions, but just in case) --> <!--d--> +<!-- With the exception of cases with multiple namespace + prefixes for the XML Schema namespace, any XML document which is + not valid per this DTD given redefinitions in its internal subset of the + 'p' and 's' parameter entities below appropriate to its namespace + declaration of the XML Schema namespace is almost certainly not + a valid schema. --> + +<!-- The simpleType element and its constituent parts + are defined in XML Schema: Part 2: Datatypes --> +<!ENTITY % xs-datatypes PUBLIC 'datatypes' 'datatypes.dtd' > + +<!ENTITY % p 'xs:'> <!-- can be overriden in the internal subset of a + schema document to establish a different + namespace prefix --> +<!ENTITY % s ':xs'> <!-- if %p is defined (e.g. as foo:) then you must + also define %s as the suffix for the appropriate + namespace declaration (e.g. :foo) --> +<!ENTITY % nds 'xmlns%s;'> + +<!-- Define all the element names, with optional prefix --> +<!ENTITY % schema "%p;schema"> +<!ENTITY % complexType "%p;complexType"> +<!ENTITY % complexContent "%p;complexContent"> +<!ENTITY % simpleContent "%p;simpleContent"> +<!ENTITY % extension "%p;extension"> +<!ENTITY % element "%p;element"> +<!ENTITY % unique "%p;unique"> +<!ENTITY % key "%p;key"> +<!ENTITY % keyref "%p;keyref"> +<!ENTITY % selector "%p;selector"> +<!ENTITY % field "%p;field"> +<!ENTITY % group "%p;group"> +<!ENTITY % all "%p;all"> +<!ENTITY % choice "%p;choice"> +<!ENTITY % sequence "%p;sequence"> +<!ENTITY % any "%p;any"> +<!ENTITY % anyAttribute "%p;anyAttribute"> +<!ENTITY % attribute "%p;attribute"> +<!ENTITY % attributeGroup "%p;attributeGroup"> +<!ENTITY % include "%p;include"> +<!ENTITY % import "%p;import"> +<!ENTITY % redefine "%p;redefine"> +<!ENTITY % notation "%p;notation"> + +<!-- annotation elements --> +<!ENTITY % annotation "%p;annotation"> +<!ENTITY % appinfo "%p;appinfo"> +<!ENTITY % documentation "%p;documentation"> + +<!-- Customisation entities for the ATTLIST of each element type. + Define one of these if your schema takes advantage of the + anyAttribute='##other' in the schema for schemas --> + +<!ENTITY % schemaAttrs ''> +<!ENTITY % complexTypeAttrs ''> +<!ENTITY % complexContentAttrs ''> +<!ENTITY % simpleContentAttrs ''> +<!ENTITY % extensionAttrs ''> +<!ENTITY % elementAttrs ''> +<!ENTITY % groupAttrs ''> +<!ENTITY % allAttrs ''> +<!ENTITY % choiceAttrs ''> +<!ENTITY % sequenceAttrs ''> +<!ENTITY % anyAttrs ''> +<!ENTITY % anyAttributeAttrs ''> +<!ENTITY % attributeAttrs ''> +<!ENTITY % attributeGroupAttrs ''> +<!ENTITY % uniqueAttrs ''> +<!ENTITY % keyAttrs ''> +<!ENTITY % keyrefAttrs ''> +<!ENTITY % selectorAttrs ''> +<!ENTITY % fieldAttrs ''> +<!ENTITY % includeAttrs ''> +<!ENTITY % importAttrs ''> +<!ENTITY % redefineAttrs ''> +<!ENTITY % notationAttrs ''> +<!ENTITY % annotationAttrs ''> +<!ENTITY % appinfoAttrs ''> +<!ENTITY % documentationAttrs ''> + +<!ENTITY % complexDerivationSet "CDATA"> + <!-- #all or space-separated list drawn from derivationChoice --> +<!ENTITY % blockSet "CDATA"> + <!-- #all or space-separated list drawn from + derivationChoice + 'substitution' --> + +<!ENTITY % mgs '%all; | %choice; | %sequence;'> +<!ENTITY % cs '%choice; | %sequence;'> +<!ENTITY % formValues '(qualified|unqualified)'> + + +<!ENTITY % attrDecls '((%attribute;| %attributeGroup;)*,(%anyAttribute;)?)'> + +<!ENTITY % particleAndAttrs '((%mgs; | %group;)?, %attrDecls;)'> + +<!-- This is used in part2 --> +<!ENTITY % restriction1 '((%mgs; | %group;)?)'> + +%xs-datatypes; + +<!-- the duplication below is to produce an unambiguous content model + which allows annotation everywhere --> +<!ELEMENT %schema; ((%include; | %import; | %redefine; | %annotation;)*, + ((%simpleType; | %complexType; + | %element; | %attribute; + | %attributeGroup; | %group; + | %notation; ), + (%annotation;)*)* )> +<!ATTLIST %schema; + targetNamespace %URIref; #IMPLIED + version CDATA #IMPLIED + %nds; %URIref; #FIXED 'http://www.w3.org/2001/XMLSchema' + xmlns CDATA #IMPLIED + finalDefault %complexDerivationSet; '' + blockDefault %blockSet; '' + id ID #IMPLIED + elementFormDefault %formValues; 'unqualified' + attributeFormDefault %formValues; 'unqualified' + xml:lang CDATA #IMPLIED + %schemaAttrs;> +<!-- Note the xmlns declaration is NOT in the Schema for Schemas, + because at the Infoset level where schemas operate, + xmlns(:prefix) is NOT an attribute! --> +<!-- The declaration of xmlns is a convenience for schema authors --> + +<!-- The id attribute here and below is for use in external references + from non-schemas using simple fragment identifiers. + It is NOT used for schema-to-schema reference, internal or + external. --> + +<!-- a type is a named content type specification which allows attribute + declarations--> +<!-- --> + +<!ELEMENT %complexType; ((%annotation;)?, + (%simpleContent;|%complexContent;| + %particleAndAttrs;))> + +<!ATTLIST %complexType; + name %NCName; #IMPLIED + id ID #IMPLIED + abstract %boolean; #IMPLIED + final %complexDerivationSet; #IMPLIED + block %complexDerivationSet; #IMPLIED + mixed (true|false) 'false' + %complexTypeAttrs;> + +<!-- particleAndAttrs is shorthand for a root type --> +<!-- mixed is disallowed if simpleContent, overriden if complexContent + has one too. --> + +<!-- If anyAttribute appears in one or more referenced attributeGroups + and/or explicitly, the intersection of the permissions is used --> + +<!ELEMENT %complexContent; ((%annotation;)?, (%restriction;|%extension;))> +<!ATTLIST %complexContent; + mixed (true|false) #IMPLIED + id ID #IMPLIED + %complexContentAttrs;> + +<!-- restriction should use the branch defined above, not the simple + one from part2; extension should use the full model --> + +<!ELEMENT %simpleContent; ((%annotation;)?, (%restriction;|%extension;))> +<!ATTLIST %simpleContent; + id ID #IMPLIED + %simpleContentAttrs;> + +<!-- restriction should use the simple branch from part2, not the + one defined above; extension should have no particle --> + +<!ELEMENT %extension; ((%annotation;)?, (%particleAndAttrs;))> +<!ATTLIST %extension; + base %QName; #REQUIRED + id ID #IMPLIED + %extensionAttrs;> + +<!-- an element is declared by either: + a name and a type (either nested or referenced via the type attribute) + or a ref to an existing element declaration --> + +<!ELEMENT %element; ((%annotation;)?, (%complexType;| %simpleType;)?, + (%unique; | %key; | %keyref;)*)> +<!-- simpleType or complexType only if no type|ref attribute --> +<!-- ref not allowed at top level --> +<!ATTLIST %element; + name %NCName; #IMPLIED + id ID #IMPLIED + ref %QName; #IMPLIED + type %QName; #IMPLIED + minOccurs %nonNegativeInteger; #IMPLIED + maxOccurs CDATA #IMPLIED + nillable %boolean; #IMPLIED + substitutionGroup %QName; #IMPLIED + abstract %boolean; #IMPLIED + final %complexDerivationSet; #IMPLIED + block %blockSet; #IMPLIED + default CDATA #IMPLIED + fixed CDATA #IMPLIED + form %formValues; #IMPLIED + %elementAttrs;> +<!-- type and ref are mutually exclusive. + name and ref are mutually exclusive, one is required --> +<!-- In the absence of type AND ref, type defaults to type of + substitutionGroup, if any, else the ur-type, i.e. unconstrained --> +<!-- default and fixed are mutually exclusive --> + +<!ELEMENT %group; ((%annotation;)?,(%mgs;)?)> +<!ATTLIST %group; + name %NCName; #IMPLIED + ref %QName; #IMPLIED + minOccurs %nonNegativeInteger; #IMPLIED + maxOccurs CDATA #IMPLIED + id ID #IMPLIED + %groupAttrs;> + +<!ELEMENT %all; ((%annotation;)?, (%element;)*)> +<!ATTLIST %all; + minOccurs (1) #IMPLIED + maxOccurs (1) #IMPLIED + id ID #IMPLIED + %allAttrs;> + +<!ELEMENT %choice; ((%annotation;)?, (%element;| %group;| %cs; | %any;)*)> +<!ATTLIST %choice; + minOccurs %nonNegativeInteger; #IMPLIED + maxOccurs CDATA #IMPLIED + id ID #IMPLIED + %choiceAttrs;> + +<!ELEMENT %sequence; ((%annotation;)?, (%element;| %group;| %cs; | %any;)*)> +<!ATTLIST %sequence; + minOccurs %nonNegativeInteger; #IMPLIED + maxOccurs CDATA #IMPLIED + id ID #IMPLIED + %sequenceAttrs;> + +<!-- an anonymous grouping in a model, or + a top-level named group definition, or a reference to same --> + +<!-- Note that if order is 'all', group is not allowed inside. + If order is 'all' THIS group must be alone (or referenced alone) at + the top level of a content model --> +<!-- If order is 'all', minOccurs==maxOccurs==1 on element/any inside --> +<!-- Should allow minOccurs=0 inside order='all' . . . --> + +<!ELEMENT %any; (%annotation;)?> +<!ATTLIST %any; + namespace CDATA '##any' + processContents (skip|lax|strict) 'strict' + minOccurs %nonNegativeInteger; '1' + maxOccurs CDATA '1' + id ID #IMPLIED + %anyAttrs;> + +<!-- namespace is interpreted as follows: + ##any - - any non-conflicting WFXML at all + + ##other - - any non-conflicting WFXML from namespace other + than targetNamespace + + ##local - - any unqualified non-conflicting WFXML/attribute + one or - - any non-conflicting WFXML from + more URI the listed namespaces + references + + ##targetNamespace ##local may appear in the above list, + with the obvious meaning --> + +<!ELEMENT %anyAttribute; (%annotation;)?> +<!ATTLIST %anyAttribute; + namespace CDATA '##any' + processContents (skip|lax|strict) 'strict' + id ID #IMPLIED + %anyAttributeAttrs;> +<!-- namespace is interpreted as for 'any' above --> + +<!-- simpleType only if no type|ref attribute --> +<!-- ref not allowed at top level, name iff at top level --> +<!ELEMENT %attribute; ((%annotation;)?, (%simpleType;)?)> +<!ATTLIST %attribute; + name %NCName; #IMPLIED + id ID #IMPLIED + ref %QName; #IMPLIED + type %QName; #IMPLIED + use (prohibited|optional|required) #IMPLIED + default CDATA #IMPLIED + fixed CDATA #IMPLIED + form %formValues; #IMPLIED + %attributeAttrs;> +<!-- type and ref are mutually exclusive. + name and ref are mutually exclusive, one is required --> +<!-- default for use is optional when nested, none otherwise --> +<!-- default and fixed are mutually exclusive --> +<!-- type attr and simpleType content are mutually exclusive --> + +<!-- an attributeGroup is a named collection of attribute decls, or a + reference thereto --> +<!ELEMENT %attributeGroup; ((%annotation;)?, + (%attribute; | %attributeGroup;)*, + (%anyAttribute;)?) > +<!ATTLIST %attributeGroup; + name %NCName; #IMPLIED + id ID #IMPLIED + ref %QName; #IMPLIED + %attributeGroupAttrs;> + +<!-- ref iff no content, no name. ref iff not top level --> + +<!-- better reference mechanisms --> +<!ELEMENT %unique; ((%annotation;)?, %selector;, (%field;)+)> +<!ATTLIST %unique; + name %NCName; #REQUIRED + id ID #IMPLIED + %uniqueAttrs;> + +<!ELEMENT %key; ((%annotation;)?, %selector;, (%field;)+)> +<!ATTLIST %key; + name %NCName; #REQUIRED + id ID #IMPLIED + %keyAttrs;> + +<!ELEMENT %keyref; ((%annotation;)?, %selector;, (%field;)+)> +<!ATTLIST %keyref; + name %NCName; #REQUIRED + refer %QName; #REQUIRED + id ID #IMPLIED + %keyrefAttrs;> + +<!ELEMENT %selector; ((%annotation;)?)> +<!ATTLIST %selector; + xpath %XPathExpr; #REQUIRED + id ID #IMPLIED + %selectorAttrs;> +<!ELEMENT %field; ((%annotation;)?)> +<!ATTLIST %field; + xpath %XPathExpr; #REQUIRED + id ID #IMPLIED + %fieldAttrs;> + +<!-- Schema combination mechanisms --> +<!ELEMENT %include; (%annotation;)?> +<!ATTLIST %include; + schemaLocation %URIref; #REQUIRED + id ID #IMPLIED + %includeAttrs;> + +<!ELEMENT %import; (%annotation;)?> +<!ATTLIST %import; + namespace %URIref; #IMPLIED + schemaLocation %URIref; #IMPLIED + id ID #IMPLIED + %importAttrs;> + +<!ELEMENT %redefine; (%annotation; | %simpleType; | %complexType; | + %attributeGroup; | %group;)*> +<!ATTLIST %redefine; + schemaLocation %URIref; #REQUIRED + id ID #IMPLIED + %redefineAttrs;> + +<!ELEMENT %notation; (%annotation;)?> +<!ATTLIST %notation; + name %NCName; #REQUIRED + id ID #IMPLIED + public CDATA #REQUIRED + system %URIref; #IMPLIED + %notationAttrs;> + +<!-- Annotation is either application information or documentation --> +<!-- By having these here they are available for datatypes as well + as all the structures elements --> + +<!ELEMENT %annotation; (%appinfo; | %documentation;)*> +<!ATTLIST %annotation; %annotationAttrs;> + +<!-- User must define annotation elements in internal subset for this + to work --> +<!ELEMENT %appinfo; ANY> <!-- too restrictive --> +<!ATTLIST %appinfo; + source %URIref; #IMPLIED + id ID #IMPLIED + %appinfoAttrs;> +<!ELEMENT %documentation; ANY> <!-- too restrictive --> +<!ATTLIST %documentation; + source %URIref; #IMPLIED + id ID #IMPLIED + xml:lang CDATA #IMPLIED + %documentationAttrs;> + +<!NOTATION XMLSchemaStructures PUBLIC + 'structures' 'http://www.w3.org/2001/XMLSchema.xsd' > +<!NOTATION XML PUBLIC + 'REC-xml-1998-0210' 'http://www.w3.org/TR/1998/REC-xml-19980210' > diff --git a/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/XMLSchema.xsd b/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/XMLSchema.xsd new file mode 100644 index 000000000..fbb0c4433 --- /dev/null +++ b/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/XMLSchema.xsd @@ -0,0 +1,2581 @@ +<?xml version='1.0' encoding='UTF-8'?> +<!-- + +W3C Software and Document Notice and License + +This work is being provided by the copyright holders under the following license. + +License + +By obtaining and/or copying this work, you (the licensee) agree that you have +read, understood, and will comply with the following terms and conditions. + +Permission to copy, modify, and distribute this work, with or without +modification, for any purpose and without fee or royalty is hereby granted, +provided that you include the following on ALL copies of the work or portions +thereof, including modifications: + +- The full text of this NOTICE in a location viewable to users of the + redistributed or derivative work. +- Any pre-existing intellectual property disclaimers, notices, or terms and + conditions. If none exist, the W3C Software and Document Short Notice should + be included. +- Notice of any changes or modifications, through a copyright statement on the + new code or document such as "This software or document includes material + copied from or derived from [title and URI of the W3C document]. + Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)." + +Disclaimers + +THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR + WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF +MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE +SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, +TRADEMARKS OR OTHER RIGHTS. + +COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT. + +The name and trademarks of copyright holders may NOT be used in advertising or +publicity pertaining to the work without specific, written prior permission. +Title to copyright in this work will at all times remain with copyright +holders. + +Changes: + +- Added license header + +--> +<!-- XML Schema schema for XML Schemas: Part 1: Structures --> +<!-- Note this schema is NOT the normative structures schema. --> +<!-- The prose copy in the structures REC is the normative --> +<!-- version (which shouldn't differ from this one except for --> +<!-- this comment and entity expansions, but just in case --> +<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "XMLSchema.dtd" [ + +<!-- provide ID type information even for parsers which only read the + internal subset --> +<!ATTLIST xs:schema id ID #IMPLIED> +<!ATTLIST xs:complexType id ID #IMPLIED> +<!ATTLIST xs:complexContent id ID #IMPLIED> +<!ATTLIST xs:simpleContent id ID #IMPLIED> +<!ATTLIST xs:extension id ID #IMPLIED> +<!ATTLIST xs:element id ID #IMPLIED> +<!ATTLIST xs:group id ID #IMPLIED> +<!ATTLIST xs:all id ID #IMPLIED> +<!ATTLIST xs:choice id ID #IMPLIED> +<!ATTLIST xs:sequence id ID #IMPLIED> +<!ATTLIST xs:any id ID #IMPLIED> +<!ATTLIST xs:anyAttribute id ID #IMPLIED> +<!ATTLIST xs:attribute id ID #IMPLIED> +<!ATTLIST xs:attributeGroup id ID #IMPLIED> +<!ATTLIST xs:unique id ID #IMPLIED> +<!ATTLIST xs:key id ID #IMPLIED> +<!ATTLIST xs:keyref id ID #IMPLIED> +<!ATTLIST xs:selector id ID #IMPLIED> +<!ATTLIST xs:field id ID #IMPLIED> +<!ATTLIST xs:include id ID #IMPLIED> +<!ATTLIST xs:import id ID #IMPLIED> +<!ATTLIST xs:redefine id ID #IMPLIED> +<!ATTLIST xs:notation id ID #IMPLIED> +<!-- + keep this schema XML1.0 DTD valid + --> + <!ENTITY % schemaAttrs 'xmlns:hfp CDATA #IMPLIED'> + + <!ELEMENT hfp:hasFacet EMPTY> + <!ATTLIST hfp:hasFacet + name NMTOKEN #REQUIRED> + + <!ELEMENT hfp:hasProperty EMPTY> + <!ATTLIST hfp:hasProperty + name NMTOKEN #REQUIRED + value CDATA #REQUIRED> +<!-- + Make sure that processors that do not read the external + subset will know about the various IDs we declare + --> + <!ATTLIST xs:simpleType id ID #IMPLIED> + <!ATTLIST xs:maxExclusive id ID #IMPLIED> + <!ATTLIST xs:minExclusive id ID #IMPLIED> + <!ATTLIST xs:maxInclusive id ID #IMPLIED> + <!ATTLIST xs:minInclusive id ID #IMPLIED> + <!ATTLIST xs:totalDigits id ID #IMPLIED> + <!ATTLIST xs:fractionDigits id ID #IMPLIED> + <!ATTLIST xs:length id ID #IMPLIED> + <!ATTLIST xs:minLength id ID #IMPLIED> + <!ATTLIST xs:maxLength id ID #IMPLIED> + <!ATTLIST xs:enumeration id ID #IMPLIED> + <!ATTLIST xs:pattern id ID #IMPLIED> + <!ATTLIST xs:appinfo id ID #IMPLIED> + <!ATTLIST xs:documentation id ID #IMPLIED> + <!ATTLIST xs:list id ID #IMPLIED> + <!ATTLIST xs:union id ID #IMPLIED> + ]> +<xs:schema targetNamespace="http://www.w3.org/2001/XMLSchema" blockDefault="#all" elementFormDefault="qualified" version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema" xml:lang="EN" xmlns:hfp="http://www.w3.org/2001/XMLSchema-hasFacetAndProperty"> + <xs:annotation> + <xs:documentation> + Part 1 version: Id: structures.xsd,v 1.2 2004/01/15 11:34:25 ht Exp + Part 2 version: Id: datatypes.xsd,v 1.3 2004/01/23 18:11:13 ht Exp + </xs:documentation> + </xs:annotation> + + <xs:annotation> + <xs:documentation source="http://www.w3.org/TR/2004/PER-xmlschema-1-20040318/structures.html"> + The schema corresponding to this document is normative, + with respect to the syntactic constraints it expresses in the + XML Schema language. The documentation (within &lt;documentation> elements) + below, is not normative, but rather highlights important aspects of + the W3C Recommendation of which this is a part</xs:documentation> + </xs:annotation> + + <xs:annotation> + <xs:documentation> + The simpleType element and all of its members are defined + towards the end of this schema document</xs:documentation> + </xs:annotation> + + <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"> + <xs:annotation> + <xs:documentation> + Get access to the xml: attribute groups for xml:lang + as declared on 'schema' and 'documentation' below + </xs:documentation> + </xs:annotation> + </xs:import> + + <xs:complexType name="openAttrs"> + <xs:annotation> + <xs:documentation> + This type is extended by almost all schema types + to allow attributes from other namespaces to be + added to user schemas. + </xs:documentation> + </xs:annotation> + <xs:complexContent> + <xs:restriction base="xs:anyType"> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="annotated"> + <xs:annotation> + <xs:documentation> + This type is extended by all types which allow annotation + other than &lt;schema&gt; itself + </xs:documentation> + </xs:annotation> + <xs:complexContent> + <xs:extension base="xs:openAttrs"> + <xs:sequence> + <xs:element ref="xs:annotation" minOccurs="0"/> + </xs:sequence> + <xs:attribute name="id" type="xs:ID"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + + <xs:group name="schemaTop"> + <xs:annotation> + <xs:documentation> + This group is for the + elements which occur freely at the top level of schemas. + All of their types are based on the "annotated" type by extension.</xs:documentation> + </xs:annotation> + <xs:choice> + <xs:group ref="xs:redefinable"/> + <xs:element ref="xs:element"/> + <xs:element ref="xs:attribute"/> + <xs:element ref="xs:notation"/> + </xs:choice> + </xs:group> + + <xs:group name="redefinable"> + <xs:annotation> + <xs:documentation> + This group is for the + elements which can self-redefine (see &lt;redefine> below).</xs:documentation> + </xs:annotation> + <xs:choice> + <xs:element ref="xs:simpleType"/> + <xs:element ref="xs:complexType"/> + <xs:element ref="xs:group"/> + <xs:element ref="xs:attributeGroup"/> + </xs:choice> + </xs:group> + + <xs:simpleType name="formChoice"> + <xs:annotation> + <xs:documentation> + A utility type, not for public use</xs:documentation> + </xs:annotation> + <xs:restriction base="xs:NMTOKEN"> + <xs:enumeration value="qualified"/> + <xs:enumeration value="unqualified"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="reducedDerivationControl"> + <xs:annotation> + <xs:documentation> + A utility type, not for public use</xs:documentation> + </xs:annotation> + <xs:restriction base="xs:derivationControl"> + <xs:enumeration value="extension"/> + <xs:enumeration value="restriction"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="derivationSet"> + <xs:annotation> + <xs:documentation> + A utility type, not for public use</xs:documentation> + <xs:documentation> + #all or (possibly empty) subset of {extension, restriction}</xs:documentation> + </xs:annotation> + <xs:union> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="#all"/> + </xs:restriction> + </xs:simpleType> + <xs:simpleType> + <xs:list itemType="xs:reducedDerivationControl"/> + </xs:simpleType> + </xs:union> + </xs:simpleType> + + <xs:simpleType name="typeDerivationControl"> + <xs:annotation> + <xs:documentation> + A utility type, not for public use</xs:documentation> + </xs:annotation> + <xs:restriction base="xs:derivationControl"> + <xs:enumeration value="extension"/> + <xs:enumeration value="restriction"/> + <xs:enumeration value="list"/> + <xs:enumeration value="union"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="fullDerivationSet"> + <xs:annotation> + <xs:documentation> + A utility type, not for public use</xs:documentation> + <xs:documentation> + #all or (possibly empty) subset of {extension, restriction, list, union}</xs:documentation> + </xs:annotation> + <xs:union> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="#all"/> + </xs:restriction> + </xs:simpleType> + <xs:simpleType> + <xs:list itemType="xs:typeDerivationControl"/> + </xs:simpleType> + </xs:union> + </xs:simpleType> + + <xs:element name="schema" id="schema"> + <xs:annotation> + <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-schema"/> + </xs:annotation> + <xs:complexType> + <xs:complexContent> + <xs:extension base="xs:openAttrs"> + <xs:sequence> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element ref="xs:include"/> + <xs:element ref="xs:import"/> + <xs:element ref="xs:redefine"/> + <xs:element ref="xs:annotation"/> + </xs:choice> + <xs:sequence minOccurs="0" maxOccurs="unbounded"> + <xs:group ref="xs:schemaTop"/> + <xs:element ref="xs:annotation" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:sequence> + <xs:attribute name="targetNamespace" type="xs:anyURI"/> + <xs:attribute name="version" type="xs:token"/> + <xs:attribute name="finalDefault" type="xs:fullDerivationSet" use="optional" default=""/> + <xs:attribute name="blockDefault" type="xs:blockSet" use="optional" default=""/> + <xs:attribute name="attributeFormDefault" type="xs:formChoice" use="optional" default="unqualified"/> + <xs:attribute name="elementFormDefault" type="xs:formChoice" use="optional" default="unqualified"/> + <xs:attribute name="id" type="xs:ID"/> + <xs:attribute ref="xml:lang"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + + <xs:key name="element"> + <xs:selector xpath="xs:element"/> + <xs:field xpath="@name"/> + </xs:key> + + <xs:key name="attribute"> + <xs:selector xpath="xs:attribute"/> + <xs:field xpath="@name"/> + </xs:key> + + <xs:key name="type"> + <xs:selector xpath="xs:complexType|xs:simpleType"/> + <xs:field xpath="@name"/> + </xs:key> + + <xs:key name="group"> + <xs:selector xpath="xs:group"/> + <xs:field xpath="@name"/> + </xs:key> + + <xs:key name="attributeGroup"> + <xs:selector xpath="xs:attributeGroup"/> + <xs:field xpath="@name"/> + </xs:key> + + <xs:key name="notation"> + <xs:selector xpath="xs:notation"/> + <xs:field xpath="@name"/> + </xs:key> + + <xs:key name="identityConstraint"> + <xs:selector xpath=".//xs:key|.//xs:unique|.//xs:keyref"/> + <xs:field xpath="@name"/> + </xs:key> + + </xs:element> + + <xs:simpleType name="allNNI"> + <xs:annotation><xs:documentation> + for maxOccurs</xs:documentation></xs:annotation> + <xs:union memberTypes="xs:nonNegativeInteger"> + <xs:simpleType> + <xs:restriction base="xs:NMTOKEN"> + <xs:enumeration value="unbounded"/> + </xs:restriction> + </xs:simpleType> + </xs:union> + </xs:simpleType> + + <xs:attributeGroup name="occurs"> + <xs:annotation><xs:documentation> + for all particles</xs:documentation></xs:annotation> + <xs:attribute name="minOccurs" type="xs:nonNegativeInteger" use="optional" default="1"/> + <xs:attribute name="maxOccurs" type="xs:allNNI" use="optional" default="1"/> + </xs:attributeGroup> + + <xs:attributeGroup name="defRef"> + <xs:annotation><xs:documentation> + for element, group and attributeGroup, + which both define and reference</xs:documentation></xs:annotation> + <xs:attribute name="name" type="xs:NCName"/> + <xs:attribute name="ref" type="xs:QName"/> + </xs:attributeGroup> + + <xs:group name="typeDefParticle"> + <xs:annotation> + <xs:documentation> + 'complexType' uses this</xs:documentation></xs:annotation> + <xs:choice> + <xs:element name="group" type="xs:groupRef"/> + <xs:element ref="xs:all"/> + <xs:element ref="xs:choice"/> + <xs:element ref="xs:sequence"/> + </xs:choice> + </xs:group> + + + + <xs:group name="nestedParticle"> + <xs:choice> + <xs:element name="element" type="xs:localElement"/> + <xs:element name="group" type="xs:groupRef"/> + <xs:element ref="xs:choice"/> + <xs:element ref="xs:sequence"/> + <xs:element ref="xs:any"/> + </xs:choice> + </xs:group> + + <xs:group name="particle"> + <xs:choice> + <xs:element name="element" type="xs:localElement"/> + <xs:element name="group" type="xs:groupRef"/> + <xs:element ref="xs:all"/> + <xs:element ref="xs:choice"/> + <xs:element ref="xs:sequence"/> + <xs:element ref="xs:any"/> + </xs:choice> + </xs:group> + + <xs:complexType name="attribute"> + <xs:complexContent> + <xs:extension base="xs:annotated"> + <xs:sequence> + <xs:element name="simpleType" minOccurs="0" type="xs:localSimpleType"/> + </xs:sequence> + <xs:attributeGroup ref="xs:defRef"/> + <xs:attribute name="type" type="xs:QName"/> + <xs:attribute name="use" use="optional" default="optional"> + <xs:simpleType> + <xs:restriction base="xs:NMTOKEN"> + <xs:enumeration value="prohibited"/> + <xs:enumeration value="optional"/> + <xs:enumeration value="required"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + <xs:attribute name="default" type="xs:string"/> + <xs:attribute name="fixed" type="xs:string"/> + <xs:attribute name="form" type="xs:formChoice"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="topLevelAttribute"> + <xs:complexContent> + <xs:restriction base="xs:attribute"> + <xs:sequence> + <xs:element ref="xs:annotation" minOccurs="0"/> + <xs:element name="simpleType" minOccurs="0" type="xs:localSimpleType"/> + </xs:sequence> + <xs:attribute name="ref" use="prohibited"/> + <xs:attribute name="form" use="prohibited"/> + <xs:attribute name="use" use="prohibited"/> + <xs:attribute name="name" use="required" type="xs:NCName"/> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + + <xs:group name="attrDecls"> + <xs:sequence> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element name="attribute" type="xs:attribute"/> + <xs:element name="attributeGroup" type="xs:attributeGroupRef"/> + </xs:choice> + <xs:element ref="xs:anyAttribute" minOccurs="0"/> + </xs:sequence> + </xs:group> + + <xs:element name="anyAttribute" type="xs:wildcard" id="anyAttribute"> + <xs:annotation> + <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-anyAttribute"/> + </xs:annotation> + </xs:element> + + <xs:group name="complexTypeModel"> + <xs:choice> + <xs:element ref="xs:simpleContent"/> + <xs:element ref="xs:complexContent"/> + <xs:sequence> + <xs:annotation> + <xs:documentation> + This branch is short for + &lt;complexContent> + &lt;restriction base="xs:anyType"> + ... + &lt;/restriction> + &lt;/complexContent></xs:documentation> + </xs:annotation> + <xs:group ref="xs:typeDefParticle" minOccurs="0"/> + <xs:group ref="xs:attrDecls"/> + </xs:sequence> + </xs:choice> + </xs:group> + + <xs:complexType name="complexType" abstract="true"> + <xs:complexContent> + <xs:extension base="xs:annotated"> + <xs:group ref="xs:complexTypeModel"/> + <xs:attribute name="name" type="xs:NCName"> + <xs:annotation> + <xs:documentation> + Will be restricted to required or forbidden</xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute name="mixed" type="xs:boolean" use="optional" default="false"> + <xs:annotation> + <xs:documentation> + Not allowed if simpleContent child is chosen. + May be overriden by setting on complexContent child.</xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute name="abstract" type="xs:boolean" use="optional" default="false"/> + <xs:attribute name="final" type="xs:derivationSet"/> + <xs:attribute name="block" type="xs:derivationSet"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="topLevelComplexType"> + <xs:complexContent> + <xs:restriction base="xs:complexType"> + <xs:sequence> + <xs:element ref="xs:annotation" minOccurs="0"/> + <xs:group ref="xs:complexTypeModel"/> + </xs:sequence> + <xs:attribute name="name" type="xs:NCName" use="required"/> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="localComplexType"> + <xs:complexContent> + <xs:restriction base="xs:complexType"> + <xs:sequence> + <xs:element ref="xs:annotation" minOccurs="0"/> + <xs:group ref="xs:complexTypeModel"/> + </xs:sequence> + <xs:attribute name="name" use="prohibited"/> + <xs:attribute name="abstract" use="prohibited"/> + <xs:attribute name="final" use="prohibited"/> + <xs:attribute name="block" use="prohibited"/> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="restrictionType"> + <xs:complexContent> + <xs:extension base="xs:annotated"> + <xs:sequence> + <xs:choice minOccurs="0"> + <xs:group ref="xs:typeDefParticle"/> + <xs:group ref="xs:simpleRestrictionModel"/> + </xs:choice> + <xs:group ref="xs:attrDecls"/> + </xs:sequence> + <xs:attribute name="base" type="xs:QName" use="required"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="complexRestrictionType"> + <xs:complexContent> + <xs:restriction base="xs:restrictionType"> + <xs:sequence> + <xs:element ref="xs:annotation" minOccurs="0"/> + <xs:choice minOccurs="0"> + <xs:annotation> + <xs:documentation>This choice is added simply to + make this a valid restriction per the REC</xs:documentation> + </xs:annotation> + <xs:group ref="xs:typeDefParticle"/> + </xs:choice> + <xs:group ref="xs:attrDecls"/> + </xs:sequence> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="extensionType"> + <xs:complexContent> + <xs:extension base="xs:annotated"> + <xs:sequence> + <xs:group ref="xs:typeDefParticle" minOccurs="0"/> + <xs:group ref="xs:attrDecls"/> + </xs:sequence> + <xs:attribute name="base" type="xs:QName" use="required"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + + <xs:element name="complexContent" id="complexContent"> + <xs:annotation> + <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-complexContent"/> + </xs:annotation> + <xs:complexType> + <xs:complexContent> + <xs:extension base="xs:annotated"> + <xs:choice> + <xs:element name="restriction" type="xs:complexRestrictionType"/> + <xs:element name="extension" type="xs:extensionType"/> + </xs:choice> + <xs:attribute name="mixed" type="xs:boolean"> + <xs:annotation> + <xs:documentation> + Overrides any setting on complexType parent.</xs:documentation> + </xs:annotation> + </xs:attribute> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + + <xs:complexType name="simpleRestrictionType"> + <xs:complexContent> + <xs:restriction base="xs:restrictionType"> + <xs:sequence> + <xs:element ref="xs:annotation" minOccurs="0"/> + <xs:choice minOccurs="0"> + <xs:annotation> + <xs:documentation>This choice is added simply to + make this a valid restriction per the REC</xs:documentation> + </xs:annotation> + <xs:group ref="xs:simpleRestrictionModel"/> + </xs:choice> + <xs:group ref="xs:attrDecls"/> + </xs:sequence> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="simpleExtensionType"> + <xs:complexContent> + <xs:restriction base="xs:extensionType"> + <xs:sequence> + <xs:annotation> + <xs:documentation> + No typeDefParticle group reference</xs:documentation> + </xs:annotation> + <xs:element ref="xs:annotation" minOccurs="0"/> + <xs:group ref="xs:attrDecls"/> + </xs:sequence> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + + <xs:element name="simpleContent" id="simpleContent"> + <xs:annotation> + <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-simpleContent"/> + </xs:annotation> + <xs:complexType> + <xs:complexContent> + <xs:extension base="xs:annotated"> + <xs:choice> + <xs:element name="restriction" type="xs:simpleRestrictionType"/> + <xs:element name="extension" type="xs:simpleExtensionType"/> + </xs:choice> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + + <xs:element name="complexType" type="xs:topLevelComplexType" id="complexType"> + <xs:annotation> + <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-complexType"/> + </xs:annotation> + </xs:element> + + + <xs:simpleType name="blockSet"> + <xs:annotation> + <xs:documentation> + A utility type, not for public use</xs:documentation> + <xs:documentation> + #all or (possibly empty) subset of {substitution, extension, + restriction}</xs:documentation> + </xs:annotation> + <xs:union> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="#all"/> + </xs:restriction> + </xs:simpleType> + <xs:simpleType> + <xs:list> + <xs:simpleType> + <xs:restriction base="xs:derivationControl"> + <xs:enumeration value="extension"/> + <xs:enumeration value="restriction"/> + <xs:enumeration value="substitution"/> + </xs:restriction> + </xs:simpleType> + </xs:list> + </xs:simpleType> + </xs:union> + </xs:simpleType> + + <xs:complexType name="element" abstract="true"> + <xs:annotation> + <xs:documentation> + The element element can be used either + at the top level to define an element-type binding globally, + or within a content model to either reference a globally-defined + element or type or declare an element-type binding locally. + The ref form is not allowed at the top level.</xs:documentation> + </xs:annotation> + + <xs:complexContent> + <xs:extension base="xs:annotated"> + <xs:sequence> + <xs:choice minOccurs="0"> + <xs:element name="simpleType" type="xs:localSimpleType"/> + <xs:element name="complexType" type="xs:localComplexType"/> + </xs:choice> + <xs:group ref="xs:identityConstraint" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + <xs:attributeGroup ref="xs:defRef"/> + <xs:attribute name="type" type="xs:QName"/> + <xs:attribute name="substitutionGroup" type="xs:QName"/> + <xs:attributeGroup ref="xs:occurs"/> + <xs:attribute name="default" type="xs:string"/> + <xs:attribute name="fixed" type="xs:string"/> + <xs:attribute name="nillable" type="xs:boolean" use="optional" default="false"/> + <xs:attribute name="abstract" type="xs:boolean" use="optional" default="false"/> + <xs:attribute name="final" type="xs:derivationSet"/> + <xs:attribute name="block" type="xs:blockSet"/> + <xs:attribute name="form" type="xs:formChoice"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="topLevelElement"> + <xs:complexContent> + <xs:restriction base="xs:element"> + <xs:sequence> + <xs:element ref="xs:annotation" minOccurs="0"/> + <xs:choice minOccurs="0"> + <xs:element name="simpleType" type="xs:localSimpleType"/> + <xs:element name="complexType" type="xs:localComplexType"/> + </xs:choice> + <xs:group ref="xs:identityConstraint" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + <xs:attribute name="ref" use="prohibited"/> + <xs:attribute name="form" use="prohibited"/> + <xs:attribute name="minOccurs" use="prohibited"/> + <xs:attribute name="maxOccurs" use="prohibited"/> + <xs:attribute name="name" use="required" type="xs:NCName"/> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="localElement"> + <xs:complexContent> + <xs:restriction base="xs:element"> + <xs:sequence> + <xs:element ref="xs:annotation" minOccurs="0"/> + <xs:choice minOccurs="0"> + <xs:element name="simpleType" type="xs:localSimpleType"/> + <xs:element name="complexType" type="xs:localComplexType"/> + </xs:choice> + <xs:group ref="xs:identityConstraint" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + <xs:attribute name="substitutionGroup" use="prohibited"/> + <xs:attribute name="final" use="prohibited"/> + <xs:attribute name="abstract" use="prohibited"/> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + + <xs:element name="element" type="xs:topLevelElement" id="element"> + <xs:annotation> + <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-element"/> + </xs:annotation> + </xs:element> + + <xs:complexType name="group" abstract="true"> + <xs:annotation> + <xs:documentation> + group type for explicit groups, named top-level groups and + group references</xs:documentation> + </xs:annotation> + <xs:complexContent> + <xs:extension base="xs:annotated"> + <xs:group ref="xs:particle" minOccurs="0" maxOccurs="unbounded"/> + <xs:attributeGroup ref="xs:defRef"/> + <xs:attributeGroup ref="xs:occurs"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="realGroup"> + <xs:complexContent> + <xs:restriction base="xs:group"> + <xs:sequence> + <xs:element ref="xs:annotation" minOccurs="0"/> + <xs:choice minOccurs="0" maxOccurs="1"> + <xs:element ref="xs:all"/> + <xs:element ref="xs:choice"/> + <xs:element ref="xs:sequence"/> + </xs:choice> + </xs:sequence> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="namedGroup"> + <xs:complexContent> + <xs:restriction base="xs:realGroup"> + <xs:sequence> + <xs:element ref="xs:annotation" minOccurs="0"/> + <xs:choice minOccurs="1" maxOccurs="1"> + <xs:element name="all"> + <xs:complexType> + <xs:complexContent> + <xs:restriction base="xs:all"> + <xs:group ref="xs:allModel"/> + <xs:attribute name="minOccurs" use="prohibited"/> + <xs:attribute name="maxOccurs" use="prohibited"/> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + </xs:element> + <xs:element name="choice" type="xs:simpleExplicitGroup"/> + <xs:element name="sequence" type="xs:simpleExplicitGroup"/> + </xs:choice> + </xs:sequence> + <xs:attribute name="name" use="required" type="xs:NCName"/> + <xs:attribute name="ref" use="prohibited"/> + <xs:attribute name="minOccurs" use="prohibited"/> + <xs:attribute name="maxOccurs" use="prohibited"/> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="groupRef"> + <xs:complexContent> + <xs:restriction base="xs:realGroup"> + <xs:sequence> + <xs:element ref="xs:annotation" minOccurs="0"/> + </xs:sequence> + <xs:attribute name="ref" use="required" type="xs:QName"/> + <xs:attribute name="name" use="prohibited"/> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="explicitGroup"> + <xs:annotation> + <xs:documentation> + group type for the three kinds of group</xs:documentation> + </xs:annotation> + <xs:complexContent> + <xs:restriction base="xs:group"> + <xs:sequence> + <xs:element ref="xs:annotation" minOccurs="0"/> + <xs:group ref="xs:nestedParticle" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + <xs:attribute name="name" type="xs:NCName" use="prohibited"/> + <xs:attribute name="ref" type="xs:QName" use="prohibited"/> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="simpleExplicitGroup"> + <xs:complexContent> + <xs:restriction base="xs:explicitGroup"> + <xs:sequence> + <xs:element ref="xs:annotation" minOccurs="0"/> + <xs:group ref="xs:nestedParticle" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + <xs:attribute name="minOccurs" use="prohibited"/> + <xs:attribute name="maxOccurs" use="prohibited"/> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + + <xs:group name="allModel"> + <xs:sequence> + <xs:element ref="xs:annotation" minOccurs="0"/> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:annotation> + <xs:documentation>This choice with min/max is here to + avoid a pblm with the Elt:All/Choice/Seq + Particle derivation constraint</xs:documentation> + </xs:annotation> + <xs:element name="element" type="xs:narrowMaxMin"/> + </xs:choice> + </xs:sequence> + </xs:group> + + + <xs:complexType name="narrowMaxMin"> + <xs:annotation> + <xs:documentation>restricted max/min</xs:documentation> + </xs:annotation> + <xs:complexContent> + <xs:restriction base="xs:localElement"> + <xs:sequence> + <xs:element ref="xs:annotation" minOccurs="0"/> + <xs:choice minOccurs="0"> + <xs:element name="simpleType" type="xs:localSimpleType"/> + <xs:element name="complexType" type="xs:localComplexType"/> + </xs:choice> + <xs:group ref="xs:identityConstraint" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + <xs:attribute name="minOccurs" use="optional" default="1"> + <xs:simpleType> + <xs:restriction base="xs:nonNegativeInteger"> + <xs:enumeration value="0"/> + <xs:enumeration value="1"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + <xs:attribute name="maxOccurs" use="optional" default="1"> + <xs:simpleType> + <xs:restriction base="xs:allNNI"> + <xs:enumeration value="0"/> + <xs:enumeration value="1"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="all"> + <xs:annotation> + <xs:documentation> + Only elements allowed inside</xs:documentation> + </xs:annotation> + <xs:complexContent> + <xs:restriction base="xs:explicitGroup"> + <xs:group ref="xs:allModel"/> + <xs:attribute name="minOccurs" use="optional" default="1"> + <xs:simpleType> + <xs:restriction base="xs:nonNegativeInteger"> + <xs:enumeration value="0"/> + <xs:enumeration value="1"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + <xs:attribute name="maxOccurs" use="optional" default="1"> + <xs:simpleType> + <xs:restriction base="xs:allNNI"> + <xs:enumeration value="1"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + + <xs:element name="all" id="all" type="xs:all"> + <xs:annotation> + <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-all"/> + </xs:annotation> + </xs:element> + + <xs:element name="choice" type="xs:explicitGroup" id="choice"> + <xs:annotation> + <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-choice"/> + </xs:annotation> + </xs:element> + + <xs:element name="sequence" type="xs:explicitGroup" id="sequence"> + <xs:annotation> + <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-sequence"/> + </xs:annotation> + </xs:element> + + <xs:element name="group" type="xs:namedGroup" id="group"> + <xs:annotation> + <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-group"/> + </xs:annotation> + </xs:element> + + <xs:complexType name="wildcard"> + <xs:complexContent> + <xs:extension base="xs:annotated"> + <xs:attribute name="namespace" type="xs:namespaceList" use="optional" default="##any"/> + <xs:attribute name="processContents" use="optional" default="strict"> + <xs:simpleType> + <xs:restriction base="xs:NMTOKEN"> + <xs:enumeration value="skip"/> + <xs:enumeration value="lax"/> + <xs:enumeration value="strict"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + </xs:extension> + </xs:complexContent> + </xs:complexType> + + <xs:element name="any" id="any"> + <xs:annotation> + <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-any"/> + </xs:annotation> + <xs:complexType> + <xs:complexContent> + <xs:extension base="xs:wildcard"> + <xs:attributeGroup ref="xs:occurs"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + + <xs:annotation> + <xs:documentation> + simple type for the value of the 'namespace' attr of + 'any' and 'anyAttribute'</xs:documentation> + </xs:annotation> + <xs:annotation> + <xs:documentation> + Value is + ##any - - any non-conflicting WFXML/attribute at all + + ##other - - any non-conflicting WFXML/attribute from + namespace other than targetNS + + ##local - - any unqualified non-conflicting WFXML/attribute + + one or - - any non-conflicting WFXML/attribute from + more URI the listed namespaces + references + (space separated) + + ##targetNamespace or ##local may appear in the above list, to + refer to the targetNamespace of the enclosing + schema or an absent targetNamespace respectively</xs:documentation> + </xs:annotation> + + <xs:simpleType name="namespaceList"> + <xs:annotation> + <xs:documentation> + A utility type, not for public use</xs:documentation> + </xs:annotation> + <xs:union> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="##any"/> + <xs:enumeration value="##other"/> + </xs:restriction> + </xs:simpleType> + <xs:simpleType> + <xs:list> + <xs:simpleType> + <xs:union memberTypes="xs:anyURI"> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="##targetNamespace"/> + <xs:enumeration value="##local"/> + </xs:restriction> + </xs:simpleType> + </xs:union> + </xs:simpleType> + </xs:list> + </xs:simpleType> + </xs:union> + </xs:simpleType> + + <xs:element name="attribute" type="xs:topLevelAttribute" id="attribute"> + <xs:annotation> + <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-attribute"/> + </xs:annotation> + </xs:element> + + <xs:complexType name="attributeGroup" abstract="true"> + <xs:complexContent> + <xs:extension base="xs:annotated"> + <xs:group ref="xs:attrDecls"/> + <xs:attributeGroup ref="xs:defRef"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="namedAttributeGroup"> + <xs:complexContent> + <xs:restriction base="xs:attributeGroup"> + <xs:sequence> + <xs:element ref="xs:annotation" minOccurs="0"/> + <xs:group ref="xs:attrDecls"/> + </xs:sequence> + <xs:attribute name="name" use="required" type="xs:NCName"/> + <xs:attribute name="ref" use="prohibited"/> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="attributeGroupRef"> + <xs:complexContent> + <xs:restriction base="xs:attributeGroup"> + <xs:sequence> + <xs:element ref="xs:annotation" minOccurs="0"/> + </xs:sequence> + <xs:attribute name="ref" use="required" type="xs:QName"/> + <xs:attribute name="name" use="prohibited"/> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + + <xs:element name="attributeGroup" type="xs:namedAttributeGroup" id="attributeGroup"> + <xs:annotation> + <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-attributeGroup"/> + </xs:annotation> + </xs:element> + + <xs:element name="include" id="include"> + <xs:annotation> + <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-include"/> + </xs:annotation> + <xs:complexType> + <xs:complexContent> + <xs:extension base="xs:annotated"> + <xs:attribute name="schemaLocation" type="xs:anyURI" use="required"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + + <xs:element name="redefine" id="redefine"> + <xs:annotation> + <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-redefine"/> + </xs:annotation> + <xs:complexType> + <xs:complexContent> + <xs:extension base="xs:openAttrs"> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element ref="xs:annotation"/> + <xs:group ref="xs:redefinable"/> + </xs:choice> + <xs:attribute name="schemaLocation" type="xs:anyURI" use="required"/> + <xs:attribute name="id" type="xs:ID"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + + <xs:element name="import" id="import"> + <xs:annotation> + <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-import"/> + </xs:annotation> + <xs:complexType> + <xs:complexContent> + <xs:extension base="xs:annotated"> + <xs:attribute name="namespace" type="xs:anyURI"/> + <xs:attribute name="schemaLocation" type="xs:anyURI"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + + <xs:element name="selector" id="selector"> + <xs:annotation> + <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-selector"/> + </xs:annotation> + <xs:complexType> + <xs:complexContent> + <xs:extension base="xs:annotated"> + <xs:attribute name="xpath" use="required"> + <xs:simpleType> + <xs:annotation> + <xs:documentation>A subset of XPath expressions for use +in selectors</xs:documentation> + <xs:documentation>A utility type, not for public +use</xs:documentation> + </xs:annotation> + <xs:restriction base="xs:token"> + <xs:annotation> + <xs:documentation>The following pattern is intended to allow XPath + expressions per the following EBNF: + Selector ::= Path ( '|' Path )* + Path ::= ('.//')? Step ( '/' Step )* + Step ::= '.' | NameTest + NameTest ::= QName | '*' | NCName ':' '*' + child:: is also allowed + </xs:documentation> + </xs:annotation> + <xs:pattern value="(\.//)?(((child::)?((\i\c*:)?(\i\c*|\*)))|\.)(/(((child::)?((\i\c*:)?(\i\c*|\*)))|\.))*(\|(\.//)?(((child::)?((\i\c*:)?(\i\c*|\*)))|\.)(/(((child::)?((\i\c*:)?(\i\c*|\*)))|\.))*)*"> + </xs:pattern> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + + <xs:element name="field" id="field"> + <xs:annotation> + <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-field"/> + </xs:annotation> + <xs:complexType> + <xs:complexContent> + <xs:extension base="xs:annotated"> + <xs:attribute name="xpath" use="required"> + <xs:simpleType> + <xs:annotation> + <xs:documentation>A subset of XPath expressions for use +in fields</xs:documentation> + <xs:documentation>A utility type, not for public +use</xs:documentation> + </xs:annotation> + <xs:restriction base="xs:token"> + <xs:annotation> + <xs:documentation>The following pattern is intended to allow XPath + expressions per the same EBNF as for selector, + with the following change: + Path ::= ('.//')? ( Step '/' )* ( Step | '@' NameTest ) + </xs:documentation> + </xs:annotation> + <xs:pattern value="(\.//)?((((child::)?((\i\c*:)?(\i\c*|\*)))|\.)/)*((((child::)?((\i\c*:)?(\i\c*|\*)))|\.)|((attribute::|@)((\i\c*:)?(\i\c*|\*))))(\|(\.//)?((((child::)?((\i\c*:)?(\i\c*|\*)))|\.)/)*((((child::)?((\i\c*:)?(\i\c*|\*)))|\.)|((attribute::|@)((\i\c*:)?(\i\c*|\*)))))*"> + </xs:pattern> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + + <xs:complexType name="keybase"> + <xs:complexContent> + <xs:extension base="xs:annotated"> + <xs:sequence> + <xs:element ref="xs:selector"/> + <xs:element ref="xs:field" minOccurs="1" maxOccurs="unbounded"/> + </xs:sequence> + <xs:attribute name="name" type="xs:NCName" use="required"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + + <xs:group name="identityConstraint"> + <xs:annotation> + <xs:documentation>The three kinds of identity constraints, all with + type of or derived from 'keybase'. + </xs:documentation> + </xs:annotation> + <xs:choice> + <xs:element ref="xs:unique"/> + <xs:element ref="xs:key"/> + <xs:element ref="xs:keyref"/> + </xs:choice> + </xs:group> + + <xs:element name="unique" type="xs:keybase" id="unique"> + <xs:annotation> + <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-unique"/> + </xs:annotation> + </xs:element> + <xs:element name="key" type="xs:keybase" id="key"> + <xs:annotation> + <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-key"/> + </xs:annotation> + </xs:element> + <xs:element name="keyref" id="keyref"> + <xs:annotation> + <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-keyref"/> + </xs:annotation> + <xs:complexType> + <xs:complexContent> + <xs:extension base="xs:keybase"> + <xs:attribute name="refer" type="xs:QName" use="required"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + + <xs:element name="notation" id="notation"> + <xs:annotation> + <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-notation"/> + </xs:annotation> + <xs:complexType> + <xs:complexContent> + <xs:extension base="xs:annotated"> + <xs:attribute name="name" type="xs:NCName" use="required"/> + <xs:attribute name="public" type="xs:public"/> + <xs:attribute name="system" type="xs:anyURI"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + + <xs:simpleType name="public"> + <xs:annotation> + <xs:documentation> + A utility type, not for public use</xs:documentation> + <xs:documentation> + A public identifier, per ISO 8879</xs:documentation> + </xs:annotation> + <xs:restriction base="xs:token"/> + </xs:simpleType> + + <xs:element name="appinfo" id="appinfo"> + <xs:annotation> + <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-appinfo"/> + </xs:annotation> + <xs:complexType mixed="true"> + <xs:sequence minOccurs="0" maxOccurs="unbounded"> + <xs:any processContents="lax"/> + </xs:sequence> + <xs:attribute name="source" type="xs:anyURI"/> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:complexType> + </xs:element> + + <xs:element name="documentation" id="documentation"> + <xs:annotation> + <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-documentation"/> + </xs:annotation> + <xs:complexType mixed="true"> + <xs:sequence minOccurs="0" maxOccurs="unbounded"> + <xs:any processContents="lax"/> + </xs:sequence> + <xs:attribute name="source" type="xs:anyURI"/> + <xs:attribute ref="xml:lang"/> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:complexType> + </xs:element> + + <xs:element name="annotation" id="annotation"> + <xs:annotation> + <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-annotation"/> + </xs:annotation> + <xs:complexType> + <xs:complexContent> + <xs:extension base="xs:openAttrs"> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element ref="xs:appinfo"/> + <xs:element ref="xs:documentation"/> + </xs:choice> + <xs:attribute name="id" type="xs:ID"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + + <xs:annotation> + <xs:documentation> + notations for use within XML Schema schemas</xs:documentation> + </xs:annotation> + + <xs:notation name="XMLSchemaStructures" public="structures" system="http://www.w3.org/2000/08/XMLSchema.xsd"/> + <xs:notation name="XML" public="REC-xml-19980210" system="http://www.w3.org/TR/1998/REC-xml-19980210"/> + + <xs:complexType name="anyType" mixed="true"> + <xs:annotation> + <xs:documentation> + Not the real urType, but as close an approximation as we can + get in the XML representation</xs:documentation> + </xs:annotation> + <xs:sequence> + <xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax"/> + </xs:sequence> + <xs:anyAttribute processContents="lax"/> + </xs:complexType> + + <xs:annotation> + <xs:documentation> + First the built-in primitive datatypes. These definitions are for + information only, the real built-in definitions are magic. + </xs:documentation> + + <xs:documentation> + For each built-in datatype in this schema (both primitive and + derived) can be uniquely addressed via a URI constructed + as follows: + 1) the base URI is the URI of the XML Schema namespace + 2) the fragment identifier is the name of the datatype + + For example, to address the int datatype, the URI is: + + http://www.w3.org/2001/XMLSchema#int + + Additionally, each facet definition element can be uniquely + addressed via a URI constructed as follows: + 1) the base URI is the URI of the XML Schema namespace + 2) the fragment identifier is the name of the facet + + For example, to address the maxInclusive facet, the URI is: + + http://www.w3.org/2001/XMLSchema#maxInclusive + + Additionally, each facet usage in a built-in datatype definition + can be uniquely addressed via a URI constructed as follows: + 1) the base URI is the URI of the XML Schema namespace + 2) the fragment identifier is the name of the datatype, followed + by a period (".") followed by the name of the facet + + For example, to address the usage of the maxInclusive facet in + the definition of int, the URI is: + + http://www.w3.org/2001/XMLSchema#int.maxInclusive + + </xs:documentation> + </xs:annotation> + + <xs:simpleType name="string" id="string"> + <xs:annotation> + <xs:appinfo> + <hfp:hasFacet name="length"/> + <hfp:hasFacet name="minLength"/> + <hfp:hasFacet name="maxLength"/> + <hfp:hasFacet name="pattern"/> + <hfp:hasFacet name="enumeration"/> + <hfp:hasFacet name="whiteSpace"/> + <hfp:hasProperty name="ordered" value="false"/> + <hfp:hasProperty name="bounded" value="false"/> + <hfp:hasProperty name="cardinality" value="countably infinite"/> + <hfp:hasProperty name="numeric" value="false"/> + </xs:appinfo> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#string"/> + </xs:annotation> + <xs:restriction base="xs:anySimpleType"> + <xs:whiteSpace value="preserve" id="string.preserve"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="boolean" id="boolean"> + <xs:annotation> + <xs:appinfo> + <hfp:hasFacet name="pattern"/> + <hfp:hasFacet name="whiteSpace"/> + <hfp:hasProperty name="ordered" value="false"/> + <hfp:hasProperty name="bounded" value="false"/> + <hfp:hasProperty name="cardinality" value="finite"/> + <hfp:hasProperty name="numeric" value="false"/> + </xs:appinfo> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#boolean"/> + </xs:annotation> + <xs:restriction base="xs:anySimpleType"> + <xs:whiteSpace value="collapse" fixed="true" + id="boolean.whiteSpace"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="float" id="float"> + <xs:annotation> + <xs:appinfo> + <hfp:hasFacet name="pattern"/> + <hfp:hasFacet name="enumeration"/> + <hfp:hasFacet name="whiteSpace"/> + <hfp:hasFacet name="maxInclusive"/> + <hfp:hasFacet name="maxExclusive"/> + <hfp:hasFacet name="minInclusive"/> + <hfp:hasFacet name="minExclusive"/> + <hfp:hasProperty name="ordered" value="total"/> + <hfp:hasProperty name="bounded" value="true"/> + <hfp:hasProperty name="cardinality" value="finite"/> + <hfp:hasProperty name="numeric" value="true"/> + </xs:appinfo> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#float"/> + </xs:annotation> + <xs:restriction base="xs:anySimpleType"> + <xs:whiteSpace value="collapse" fixed="true" + id="float.whiteSpace"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="double" id="double"> + <xs:annotation> + <xs:appinfo> + <hfp:hasFacet name="pattern"/> + <hfp:hasFacet name="enumeration"/> + <hfp:hasFacet name="whiteSpace"/> + <hfp:hasFacet name="maxInclusive"/> + <hfp:hasFacet name="maxExclusive"/> + <hfp:hasFacet name="minInclusive"/> + <hfp:hasFacet name="minExclusive"/> + <hfp:hasProperty name="ordered" value="total"/> + <hfp:hasProperty name="bounded" value="true"/> + <hfp:hasProperty name="cardinality" value="finite"/> + <hfp:hasProperty name="numeric" value="true"/> + </xs:appinfo> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#double"/> + </xs:annotation> + <xs:restriction base="xs:anySimpleType"> + <xs:whiteSpace value="collapse" fixed="true" + id="double.whiteSpace"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="decimal" id="decimal"> + <xs:annotation> + <xs:appinfo> + <hfp:hasFacet name="totalDigits"/> + <hfp:hasFacet name="fractionDigits"/> + <hfp:hasFacet name="pattern"/> + <hfp:hasFacet name="whiteSpace"/> + <hfp:hasFacet name="enumeration"/> + <hfp:hasFacet name="maxInclusive"/> + <hfp:hasFacet name="maxExclusive"/> + <hfp:hasFacet name="minInclusive"/> + <hfp:hasFacet name="minExclusive"/> + <hfp:hasProperty name="ordered" value="total"/> + <hfp:hasProperty name="bounded" value="false"/> + <hfp:hasProperty name="cardinality" + value="countably infinite"/> + <hfp:hasProperty name="numeric" value="true"/> + </xs:appinfo> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#decimal"/> + </xs:annotation> + <xs:restriction base="xs:anySimpleType"> + <xs:whiteSpace value="collapse" fixed="true" + id="decimal.whiteSpace"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="duration" id="duration"> + <xs:annotation> + <xs:appinfo> + <hfp:hasFacet name="pattern"/> + <hfp:hasFacet name="enumeration"/> + <hfp:hasFacet name="whiteSpace"/> + <hfp:hasFacet name="maxInclusive"/> + <hfp:hasFacet name="maxExclusive"/> + <hfp:hasFacet name="minInclusive"/> + <hfp:hasFacet name="minExclusive"/> + <hfp:hasProperty name="ordered" value="partial"/> + <hfp:hasProperty name="bounded" value="false"/> + <hfp:hasProperty name="cardinality" + value="countably infinite"/> + <hfp:hasProperty name="numeric" value="false"/> + </xs:appinfo> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#duration"/> + </xs:annotation> + <xs:restriction base="xs:anySimpleType"> + <xs:whiteSpace value="collapse" fixed="true" + id="duration.whiteSpace"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="dateTime" id="dateTime"> + <xs:annotation> + <xs:appinfo> + <hfp:hasFacet name="pattern"/> + <hfp:hasFacet name="enumeration"/> + <hfp:hasFacet name="whiteSpace"/> + <hfp:hasFacet name="maxInclusive"/> + <hfp:hasFacet name="maxExclusive"/> + <hfp:hasFacet name="minInclusive"/> + <hfp:hasFacet name="minExclusive"/> + <hfp:hasProperty name="ordered" value="partial"/> + <hfp:hasProperty name="bounded" value="false"/> + <hfp:hasProperty name="cardinality" + value="countably infinite"/> + <hfp:hasProperty name="numeric" value="false"/> + </xs:appinfo> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#dateTime"/> + </xs:annotation> + <xs:restriction base="xs:anySimpleType"> + <xs:whiteSpace value="collapse" fixed="true" + id="dateTime.whiteSpace"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="time" id="time"> + <xs:annotation> + <xs:appinfo> + <hfp:hasFacet name="pattern"/> + <hfp:hasFacet name="enumeration"/> + <hfp:hasFacet name="whiteSpace"/> + <hfp:hasFacet name="maxInclusive"/> + <hfp:hasFacet name="maxExclusive"/> + <hfp:hasFacet name="minInclusive"/> + <hfp:hasFacet name="minExclusive"/> + <hfp:hasProperty name="ordered" value="partial"/> + <hfp:hasProperty name="bounded" value="false"/> + <hfp:hasProperty name="cardinality" + value="countably infinite"/> + <hfp:hasProperty name="numeric" value="false"/> + </xs:appinfo> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#time"/> + </xs:annotation> + <xs:restriction base="xs:anySimpleType"> + <xs:whiteSpace value="collapse" fixed="true" + id="time.whiteSpace"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="date" id="date"> + <xs:annotation> + <xs:appinfo> + <hfp:hasFacet name="pattern"/> + <hfp:hasFacet name="enumeration"/> + <hfp:hasFacet name="whiteSpace"/> + <hfp:hasFacet name="maxInclusive"/> + <hfp:hasFacet name="maxExclusive"/> + <hfp:hasFacet name="minInclusive"/> + <hfp:hasFacet name="minExclusive"/> + <hfp:hasProperty name="ordered" value="partial"/> + <hfp:hasProperty name="bounded" value="false"/> + <hfp:hasProperty name="cardinality" + value="countably infinite"/> + <hfp:hasProperty name="numeric" value="false"/> + </xs:appinfo> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#date"/> + </xs:annotation> + <xs:restriction base="xs:anySimpleType"> + <xs:whiteSpace value="collapse" fixed="true" + id="date.whiteSpace"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="gYearMonth" id="gYearMonth"> + <xs:annotation> + <xs:appinfo> + <hfp:hasFacet name="pattern"/> + <hfp:hasFacet name="enumeration"/> + <hfp:hasFacet name="whiteSpace"/> + <hfp:hasFacet name="maxInclusive"/> + <hfp:hasFacet name="maxExclusive"/> + <hfp:hasFacet name="minInclusive"/> + <hfp:hasFacet name="minExclusive"/> + <hfp:hasProperty name="ordered" value="partial"/> + <hfp:hasProperty name="bounded" value="false"/> + <hfp:hasProperty name="cardinality" + value="countably infinite"/> + <hfp:hasProperty name="numeric" value="false"/> + </xs:appinfo> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#gYearMonth"/> + </xs:annotation> + <xs:restriction base="xs:anySimpleType"> + <xs:whiteSpace value="collapse" fixed="true" + id="gYearMonth.whiteSpace"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="gYear" id="gYear"> + <xs:annotation> + <xs:appinfo> + <hfp:hasFacet name="pattern"/> + <hfp:hasFacet name="enumeration"/> + <hfp:hasFacet name="whiteSpace"/> + <hfp:hasFacet name="maxInclusive"/> + <hfp:hasFacet name="maxExclusive"/> + <hfp:hasFacet name="minInclusive"/> + <hfp:hasFacet name="minExclusive"/> + <hfp:hasProperty name="ordered" value="partial"/> + <hfp:hasProperty name="bounded" value="false"/> + <hfp:hasProperty name="cardinality" + value="countably infinite"/> + <hfp:hasProperty name="numeric" value="false"/> + </xs:appinfo> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#gYear"/> + </xs:annotation> + <xs:restriction base="xs:anySimpleType"> + <xs:whiteSpace value="collapse" fixed="true" + id="gYear.whiteSpace"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="gMonthDay" id="gMonthDay"> + <xs:annotation> + <xs:appinfo> + <hfp:hasFacet name="pattern"/> + <hfp:hasFacet name="enumeration"/> + <hfp:hasFacet name="whiteSpace"/> + <hfp:hasFacet name="maxInclusive"/> + <hfp:hasFacet name="maxExclusive"/> + <hfp:hasFacet name="minInclusive"/> + <hfp:hasFacet name="minExclusive"/> + <hfp:hasProperty name="ordered" value="partial"/> + <hfp:hasProperty name="bounded" value="false"/> + <hfp:hasProperty name="cardinality" + value="countably infinite"/> + <hfp:hasProperty name="numeric" value="false"/> + </xs:appinfo> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#gMonthDay"/> + </xs:annotation> + <xs:restriction base="xs:anySimpleType"> + <xs:whiteSpace value="collapse" fixed="true" + id="gMonthDay.whiteSpace"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="gDay" id="gDay"> + <xs:annotation> + <xs:appinfo> + <hfp:hasFacet name="pattern"/> + <hfp:hasFacet name="enumeration"/> + <hfp:hasFacet name="whiteSpace"/> + <hfp:hasFacet name="maxInclusive"/> + <hfp:hasFacet name="maxExclusive"/> + <hfp:hasFacet name="minInclusive"/> + <hfp:hasFacet name="minExclusive"/> + <hfp:hasProperty name="ordered" value="partial"/> + <hfp:hasProperty name="bounded" value="false"/> + <hfp:hasProperty name="cardinality" + value="countably infinite"/> + <hfp:hasProperty name="numeric" value="false"/> + </xs:appinfo> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#gDay"/> + </xs:annotation> + <xs:restriction base="xs:anySimpleType"> + <xs:whiteSpace value="collapse" fixed="true" + id="gDay.whiteSpace"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="gMonth" id="gMonth"> + <xs:annotation> + <xs:appinfo> + <hfp:hasFacet name="pattern"/> + <hfp:hasFacet name="enumeration"/> + <hfp:hasFacet name="whiteSpace"/> + <hfp:hasFacet name="maxInclusive"/> + <hfp:hasFacet name="maxExclusive"/> + <hfp:hasFacet name="minInclusive"/> + <hfp:hasFacet name="minExclusive"/> + <hfp:hasProperty name="ordered" value="partial"/> + <hfp:hasProperty name="bounded" value="false"/> + <hfp:hasProperty name="cardinality" + value="countably infinite"/> + <hfp:hasProperty name="numeric" value="false"/> + </xs:appinfo> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#gMonth"/> + </xs:annotation> + <xs:restriction base="xs:anySimpleType"> + <xs:whiteSpace value="collapse" fixed="true" + id="gMonth.whiteSpace"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="hexBinary" id="hexBinary"> + <xs:annotation> + <xs:appinfo> + <hfp:hasFacet name="length"/> + <hfp:hasFacet name="minLength"/> + <hfp:hasFacet name="maxLength"/> + <hfp:hasFacet name="pattern"/> + <hfp:hasFacet name="enumeration"/> + <hfp:hasFacet name="whiteSpace"/> + <hfp:hasProperty name="ordered" value="false"/> + <hfp:hasProperty name="bounded" value="false"/> + <hfp:hasProperty name="cardinality" + value="countably infinite"/> + <hfp:hasProperty name="numeric" value="false"/> + </xs:appinfo> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#binary"/> + </xs:annotation> + <xs:restriction base="xs:anySimpleType"> + <xs:whiteSpace value="collapse" fixed="true" + id="hexBinary.whiteSpace"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="base64Binary" id="base64Binary"> + <xs:annotation> + <xs:appinfo> + <hfp:hasFacet name="length"/> + <hfp:hasFacet name="minLength"/> + <hfp:hasFacet name="maxLength"/> + <hfp:hasFacet name="pattern"/> + <hfp:hasFacet name="enumeration"/> + <hfp:hasFacet name="whiteSpace"/> + <hfp:hasProperty name="ordered" value="false"/> + <hfp:hasProperty name="bounded" value="false"/> + <hfp:hasProperty name="cardinality" + value="countably infinite"/> + <hfp:hasProperty name="numeric" value="false"/> + </xs:appinfo> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#base64Binary"/> + </xs:annotation> + <xs:restriction base="xs:anySimpleType"> + <xs:whiteSpace value="collapse" fixed="true" + id="base64Binary.whiteSpace"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="anyURI" id="anyURI"> + <xs:annotation> + <xs:appinfo> + <hfp:hasFacet name="length"/> + <hfp:hasFacet name="minLength"/> + <hfp:hasFacet name="maxLength"/> + <hfp:hasFacet name="pattern"/> + <hfp:hasFacet name="enumeration"/> + <hfp:hasFacet name="whiteSpace"/> + <hfp:hasProperty name="ordered" value="false"/> + <hfp:hasProperty name="bounded" value="false"/> + <hfp:hasProperty name="cardinality" + value="countably infinite"/> + <hfp:hasProperty name="numeric" value="false"/> + </xs:appinfo> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#anyURI"/> + </xs:annotation> + <xs:restriction base="xs:anySimpleType"> + <xs:whiteSpace value="collapse" fixed="true" + id="anyURI.whiteSpace"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="QName" id="QName"> + <xs:annotation> + <xs:appinfo> + <hfp:hasFacet name="length"/> + <hfp:hasFacet name="minLength"/> + <hfp:hasFacet name="maxLength"/> + <hfp:hasFacet name="pattern"/> + <hfp:hasFacet name="enumeration"/> + <hfp:hasFacet name="whiteSpace"/> + <hfp:hasProperty name="ordered" value="false"/> + <hfp:hasProperty name="bounded" value="false"/> + <hfp:hasProperty name="cardinality" + value="countably infinite"/> + <hfp:hasProperty name="numeric" value="false"/> + </xs:appinfo> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#QName"/> + </xs:annotation> + <xs:restriction base="xs:anySimpleType"> + <xs:whiteSpace value="collapse" fixed="true" + id="QName.whiteSpace"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="NOTATION" id="NOTATION"> + <xs:annotation> + <xs:appinfo> + <hfp:hasFacet name="length"/> + <hfp:hasFacet name="minLength"/> + <hfp:hasFacet name="maxLength"/> + <hfp:hasFacet name="pattern"/> + <hfp:hasFacet name="enumeration"/> + <hfp:hasFacet name="whiteSpace"/> + <hfp:hasProperty name="ordered" value="false"/> + <hfp:hasProperty name="bounded" value="false"/> + <hfp:hasProperty name="cardinality" + value="countably infinite"/> + <hfp:hasProperty name="numeric" value="false"/> + </xs:appinfo> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#NOTATION"/> + <xs:documentation> + NOTATION cannot be used directly in a schema; rather a type + must be derived from it by specifying at least one enumeration + facet whose value is the name of a NOTATION declared in the + schema. + </xs:documentation> + </xs:annotation> + <xs:restriction base="xs:anySimpleType"> + <xs:whiteSpace value="collapse" fixed="true" + id="NOTATION.whiteSpace"/> + </xs:restriction> + </xs:simpleType> + + <xs:annotation> + <xs:documentation> + Now the derived primitive types + </xs:documentation> + </xs:annotation> + + <xs:simpleType name="normalizedString" id="normalizedString"> + <xs:annotation> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#normalizedString"/> + </xs:annotation> + <xs:restriction base="xs:string"> + <xs:whiteSpace value="replace" + id="normalizedString.whiteSpace"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="token" id="token"> + <xs:annotation> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#token"/> + </xs:annotation> + <xs:restriction base="xs:normalizedString"> + <xs:whiteSpace value="collapse" id="token.whiteSpace"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="language" id="language"> + <xs:annotation> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#language"/> + </xs:annotation> + <xs:restriction base="xs:token"> + <xs:pattern + value="[a-zA-Z]{1,8}(-[a-zA-Z0-9]{1,8})*" + id="language.pattern"> + <xs:annotation> + <xs:documentation + source="http://www.ietf.org/rfc/rfc3066.txt"> + pattern specifies the content of section 2.12 of XML 1.0e2 + and RFC 3066 (Revised version of RFC 1766). + </xs:documentation> + </xs:annotation> + </xs:pattern> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="IDREFS" id="IDREFS"> + <xs:annotation> + <xs:appinfo> + <hfp:hasFacet name="length"/> + <hfp:hasFacet name="minLength"/> + <hfp:hasFacet name="maxLength"/> + <hfp:hasFacet name="enumeration"/> + <hfp:hasFacet name="whiteSpace"/> + <hfp:hasFacet name="pattern"/> + <hfp:hasProperty name="ordered" value="false"/> + <hfp:hasProperty name="bounded" value="false"/> + <hfp:hasProperty name="cardinality" + value="countably infinite"/> + <hfp:hasProperty name="numeric" value="false"/> + </xs:appinfo> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#IDREFS"/> + </xs:annotation> + <xs:restriction> + <xs:simpleType> + <xs:list itemType="xs:IDREF"/> + </xs:simpleType> + <xs:minLength value="1" id="IDREFS.minLength"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="ENTITIES" id="ENTITIES"> + <xs:annotation> + <xs:appinfo> + <hfp:hasFacet name="length"/> + <hfp:hasFacet name="minLength"/> + <hfp:hasFacet name="maxLength"/> + <hfp:hasFacet name="enumeration"/> + <hfp:hasFacet name="whiteSpace"/> + <hfp:hasFacet name="pattern"/> + <hfp:hasProperty name="ordered" value="false"/> + <hfp:hasProperty name="bounded" value="false"/> + <hfp:hasProperty name="cardinality" + value="countably infinite"/> + <hfp:hasProperty name="numeric" value="false"/> + </xs:appinfo> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#ENTITIES"/> + </xs:annotation> + <xs:restriction> + <xs:simpleType> + <xs:list itemType="xs:ENTITY"/> + </xs:simpleType> + <xs:minLength value="1" id="ENTITIES.minLength"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="NMTOKEN" id="NMTOKEN"> + <xs:annotation> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#NMTOKEN"/> + </xs:annotation> + <xs:restriction base="xs:token"> + <xs:pattern value="\c+" id="NMTOKEN.pattern"> + <xs:annotation> + <xs:documentation + source="http://www.w3.org/TR/REC-xml#NT-Nmtoken"> + pattern matches production 7 from the XML spec + </xs:documentation> + </xs:annotation> + </xs:pattern> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="NMTOKENS" id="NMTOKENS"> + <xs:annotation> + <xs:appinfo> + <hfp:hasFacet name="length"/> + <hfp:hasFacet name="minLength"/> + <hfp:hasFacet name="maxLength"/> + <hfp:hasFacet name="enumeration"/> + <hfp:hasFacet name="whiteSpace"/> + <hfp:hasFacet name="pattern"/> + <hfp:hasProperty name="ordered" value="false"/> + <hfp:hasProperty name="bounded" value="false"/> + <hfp:hasProperty name="cardinality" + value="countably infinite"/> + <hfp:hasProperty name="numeric" value="false"/> + </xs:appinfo> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#NMTOKENS"/> + </xs:annotation> + <xs:restriction> + <xs:simpleType> + <xs:list itemType="xs:NMTOKEN"/> + </xs:simpleType> + <xs:minLength value="1" id="NMTOKENS.minLength"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="Name" id="Name"> + <xs:annotation> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#Name"/> + </xs:annotation> + <xs:restriction base="xs:token"> + <xs:pattern value="\i\c*" id="Name.pattern"> + <xs:annotation> + <xs:documentation + source="http://www.w3.org/TR/REC-xml#NT-Name"> + pattern matches production 5 from the XML spec + </xs:documentation> + </xs:annotation> + </xs:pattern> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="NCName" id="NCName"> + <xs:annotation> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#NCName"/> + </xs:annotation> + <xs:restriction base="xs:Name"> + <xs:pattern value="[\i-[:]][\c-[:]]*" id="NCName.pattern"> + <xs:annotation> + <xs:documentation + source="http://www.w3.org/TR/REC-xml-names/#NT-NCName"> + pattern matches production 4 from the Namespaces in XML spec + </xs:documentation> + </xs:annotation> + </xs:pattern> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="ID" id="ID"> + <xs:annotation> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#ID"/> + </xs:annotation> + <xs:restriction base="xs:NCName"/> + </xs:simpleType> + + <xs:simpleType name="IDREF" id="IDREF"> + <xs:annotation> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#IDREF"/> + </xs:annotation> + <xs:restriction base="xs:NCName"/> + </xs:simpleType> + + <xs:simpleType name="ENTITY" id="ENTITY"> + <xs:annotation> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#ENTITY"/> + </xs:annotation> + <xs:restriction base="xs:NCName"/> + </xs:simpleType> + + <xs:simpleType name="integer" id="integer"> + <xs:annotation> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#integer"/> + </xs:annotation> + <xs:restriction base="xs:decimal"> + <xs:fractionDigits value="0" fixed="true" id="integer.fractionDigits"/> + <xs:pattern value="[\-+]?[0-9]+"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="nonPositiveInteger" id="nonPositiveInteger"> + <xs:annotation> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#nonPositiveInteger"/> + </xs:annotation> + <xs:restriction base="xs:integer"> + <xs:maxInclusive value="0" id="nonPositiveInteger.maxInclusive"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="negativeInteger" id="negativeInteger"> + <xs:annotation> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#negativeInteger"/> + </xs:annotation> + <xs:restriction base="xs:nonPositiveInteger"> + <xs:maxInclusive value="-1" id="negativeInteger.maxInclusive"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="long" id="long"> + <xs:annotation> + <xs:appinfo> + <hfp:hasProperty name="bounded" value="true"/> + <hfp:hasProperty name="cardinality" value="finite"/> + </xs:appinfo> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#long"/> + </xs:annotation> + <xs:restriction base="xs:integer"> + <xs:minInclusive value="-9223372036854775808" id="long.minInclusive"/> + <xs:maxInclusive value="9223372036854775807" id="long.maxInclusive"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="int" id="int"> + <xs:annotation> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#int"/> + </xs:annotation> + <xs:restriction base="xs:long"> + <xs:minInclusive value="-2147483648" id="int.minInclusive"/> + <xs:maxInclusive value="2147483647" id="int.maxInclusive"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="short" id="short"> + <xs:annotation> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#short"/> + </xs:annotation> + <xs:restriction base="xs:int"> + <xs:minInclusive value="-32768" id="short.minInclusive"/> + <xs:maxInclusive value="32767" id="short.maxInclusive"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="byte" id="byte"> + <xs:annotation> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#byte"/> + </xs:annotation> + <xs:restriction base="xs:short"> + <xs:minInclusive value="-128" id="byte.minInclusive"/> + <xs:maxInclusive value="127" id="byte.maxInclusive"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="nonNegativeInteger" id="nonNegativeInteger"> + <xs:annotation> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#nonNegativeInteger"/> + </xs:annotation> + <xs:restriction base="xs:integer"> + <xs:minInclusive value="0" id="nonNegativeInteger.minInclusive"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="unsignedLong" id="unsignedLong"> + <xs:annotation> + <xs:appinfo> + <hfp:hasProperty name="bounded" value="true"/> + <hfp:hasProperty name="cardinality" value="finite"/> + </xs:appinfo> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#unsignedLong"/> + </xs:annotation> + <xs:restriction base="xs:nonNegativeInteger"> + <xs:maxInclusive value="18446744073709551615" + id="unsignedLong.maxInclusive"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="unsignedInt" id="unsignedInt"> + <xs:annotation> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#unsignedInt"/> + </xs:annotation> + <xs:restriction base="xs:unsignedLong"> + <xs:maxInclusive value="4294967295" + id="unsignedInt.maxInclusive"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="unsignedShort" id="unsignedShort"> + <xs:annotation> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#unsignedShort"/> + </xs:annotation> + <xs:restriction base="xs:unsignedInt"> + <xs:maxInclusive value="65535" + id="unsignedShort.maxInclusive"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="unsignedByte" id="unsignedByte"> + <xs:annotation> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#unsignedByte"/> + </xs:annotation> + <xs:restriction base="xs:unsignedShort"> + <xs:maxInclusive value="255" id="unsignedByte.maxInclusive"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="positiveInteger" id="positiveInteger"> + <xs:annotation> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#positiveInteger"/> + </xs:annotation> + <xs:restriction base="xs:nonNegativeInteger"> + <xs:minInclusive value="1" id="positiveInteger.minInclusive"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="derivationControl"> + <xs:annotation> + <xs:documentation> + A utility type, not for public use</xs:documentation> + </xs:annotation> + <xs:restriction base="xs:NMTOKEN"> + <xs:enumeration value="substitution"/> + <xs:enumeration value="extension"/> + <xs:enumeration value="restriction"/> + <xs:enumeration value="list"/> + <xs:enumeration value="union"/> + </xs:restriction> + </xs:simpleType> + + <xs:group name="simpleDerivation"> + <xs:choice> + <xs:element ref="xs:restriction"/> + <xs:element ref="xs:list"/> + <xs:element ref="xs:union"/> + </xs:choice> + </xs:group> + + <xs:simpleType name="simpleDerivationSet"> + <xs:annotation> + <xs:documentation> + #all or (possibly empty) subset of {restriction, union, list} + </xs:documentation> + <xs:documentation> + A utility type, not for public use</xs:documentation> + </xs:annotation> + <xs:union> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="#all"/> + </xs:restriction> + </xs:simpleType> + <xs:simpleType> + <xs:list> + <xs:simpleType> + <xs:restriction base="xs:derivationControl"> + <xs:enumeration value="list"/> + <xs:enumeration value="union"/> + <xs:enumeration value="restriction"/> + </xs:restriction> + </xs:simpleType> + </xs:list> + </xs:simpleType> + </xs:union> + </xs:simpleType> + + <xs:complexType name="simpleType" abstract="true"> + <xs:complexContent> + <xs:extension base="xs:annotated"> + <xs:group ref="xs:simpleDerivation"/> + <xs:attribute name="final" type="xs:simpleDerivationSet"/> + <xs:attribute name="name" type="xs:NCName"> + <xs:annotation> + <xs:documentation> + Can be restricted to required or forbidden + </xs:documentation> + </xs:annotation> + </xs:attribute> + </xs:extension> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="topLevelSimpleType"> + <xs:complexContent> + <xs:restriction base="xs:simpleType"> + <xs:sequence> + <xs:element ref="xs:annotation" minOccurs="0"/> + <xs:group ref="xs:simpleDerivation"/> + </xs:sequence> + <xs:attribute name="name" use="required" + type="xs:NCName"> + <xs:annotation> + <xs:documentation> + Required at the top level + </xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="localSimpleType"> + <xs:complexContent> + <xs:restriction base="xs:simpleType"> + <xs:sequence> + <xs:element ref="xs:annotation" minOccurs="0"/> + <xs:group ref="xs:simpleDerivation"/> + </xs:sequence> + <xs:attribute name="name" use="prohibited"> + <xs:annotation> + <xs:documentation> + Forbidden when nested + </xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute name="final" use="prohibited"/> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + + <xs:element name="simpleType" type="xs:topLevelSimpleType" id="simpleType"> + <xs:annotation> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#element-simpleType"/> + </xs:annotation> + </xs:element> + + <xs:group name="facets"> + <xs:annotation> + <xs:documentation> + We should use a substitution group for facets, but + that's ruled out because it would allow users to + add their own, which we're not ready for yet. + </xs:documentation> + </xs:annotation> + <xs:choice> + <xs:element ref="xs:minExclusive"/> + <xs:element ref="xs:minInclusive"/> + <xs:element ref="xs:maxExclusive"/> + <xs:element ref="xs:maxInclusive"/> + <xs:element ref="xs:totalDigits"/> + <xs:element ref="xs:fractionDigits"/> + <xs:element ref="xs:length"/> + <xs:element ref="xs:minLength"/> + <xs:element ref="xs:maxLength"/> + <xs:element ref="xs:enumeration"/> + <xs:element ref="xs:whiteSpace"/> + <xs:element ref="xs:pattern"/> + </xs:choice> + </xs:group> + + <xs:group name="simpleRestrictionModel"> + <xs:sequence> + <xs:element name="simpleType" type="xs:localSimpleType" minOccurs="0"/> + <xs:group ref="xs:facets" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:group> + + <xs:element name="restriction" id="restriction"> + <xs:complexType> + <xs:annotation> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#element-restriction"> + base attribute and simpleType child are mutually + exclusive, but one or other is required + </xs:documentation> + </xs:annotation> + <xs:complexContent> + <xs:extension base="xs:annotated"> + <xs:group ref="xs:simpleRestrictionModel"/> + <xs:attribute name="base" type="xs:QName" use="optional"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + + <xs:element name="list" id="list"> + <xs:complexType> + <xs:annotation> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#element-list"> + itemType attribute and simpleType child are mutually + exclusive, but one or other is required + </xs:documentation> + </xs:annotation> + <xs:complexContent> + <xs:extension base="xs:annotated"> + <xs:sequence> + <xs:element name="simpleType" type="xs:localSimpleType" + minOccurs="0"/> + </xs:sequence> + <xs:attribute name="itemType" type="xs:QName" use="optional"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + + <xs:element name="union" id="union"> + <xs:complexType> + <xs:annotation> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#element-union"> + memberTypes attribute must be non-empty or there must be + at least one simpleType child + </xs:documentation> + </xs:annotation> + <xs:complexContent> + <xs:extension base="xs:annotated"> + <xs:sequence> + <xs:element name="simpleType" type="xs:localSimpleType" + minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + <xs:attribute name="memberTypes" use="optional"> + <xs:simpleType> + <xs:list itemType="xs:QName"/> + </xs:simpleType> + </xs:attribute> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + + <xs:complexType name="facet"> + <xs:complexContent> + <xs:extension base="xs:annotated"> + <xs:attribute name="value" use="required"/> + <xs:attribute name="fixed" type="xs:boolean" use="optional" + default="false"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="noFixedFacet"> + <xs:complexContent> + <xs:restriction base="xs:facet"> + <xs:sequence> + <xs:element ref="xs:annotation" minOccurs="0"/> + </xs:sequence> + <xs:attribute name="fixed" use="prohibited"/> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + + <xs:element name="minExclusive" id="minExclusive" type="xs:facet"> + <xs:annotation> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#element-minExclusive"/> + </xs:annotation> + </xs:element> + <xs:element name="minInclusive" id="minInclusive" type="xs:facet"> + <xs:annotation> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#element-minInclusive"/> + </xs:annotation> + </xs:element> + + <xs:element name="maxExclusive" id="maxExclusive" type="xs:facet"> + <xs:annotation> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#element-maxExclusive"/> + </xs:annotation> + </xs:element> + <xs:element name="maxInclusive" id="maxInclusive" type="xs:facet"> + <xs:annotation> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#element-maxInclusive"/> + </xs:annotation> + </xs:element> + + <xs:complexType name="numFacet"> + <xs:complexContent> + <xs:restriction base="xs:facet"> + <xs:sequence> + <xs:element ref="xs:annotation" minOccurs="0"/> + </xs:sequence> + <xs:attribute name="value" type="xs:nonNegativeInteger" use="required"/> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + + <xs:element name="totalDigits" id="totalDigits"> + <xs:annotation> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#element-totalDigits"/> + </xs:annotation> + <xs:complexType> + <xs:complexContent> + <xs:restriction base="xs:numFacet"> + <xs:sequence> + <xs:element ref="xs:annotation" minOccurs="0"/> + </xs:sequence> + <xs:attribute name="value" type="xs:positiveInteger" use="required"/> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + </xs:element> + <xs:element name="fractionDigits" id="fractionDigits" type="xs:numFacet"> + <xs:annotation> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#element-fractionDigits"/> + </xs:annotation> + </xs:element> + + <xs:element name="length" id="length" type="xs:numFacet"> + <xs:annotation> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#element-length"/> + </xs:annotation> + </xs:element> + <xs:element name="minLength" id="minLength" type="xs:numFacet"> + <xs:annotation> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#element-minLength"/> + </xs:annotation> + </xs:element> + <xs:element name="maxLength" id="maxLength" type="xs:numFacet"> + <xs:annotation> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#element-maxLength"/> + </xs:annotation> + </xs:element> + + <xs:element name="enumeration" id="enumeration" type="xs:noFixedFacet"> + <xs:annotation> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#element-enumeration"/> + </xs:annotation> + </xs:element> + + <xs:element name="whiteSpace" id="whiteSpace"> + <xs:annotation> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#element-whiteSpace"/> + </xs:annotation> + <xs:complexType> + <xs:complexContent> + <xs:restriction base="xs:facet"> + <xs:sequence> + <xs:element ref="xs:annotation" minOccurs="0"/> + </xs:sequence> + <xs:attribute name="value" use="required"> + <xs:simpleType> + <xs:restriction base="xs:NMTOKEN"> + <xs:enumeration value="preserve"/> + <xs:enumeration value="replace"/> + <xs:enumeration value="collapse"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + </xs:element> + + <xs:element name="pattern" id="pattern"> + <xs:annotation> + <xs:documentation + source="http://www.w3.org/TR/xmlschema-2/#element-pattern"/> + </xs:annotation> + <xs:complexType> + <xs:complexContent> + <xs:restriction base="xs:noFixedFacet"> + <xs:sequence> + <xs:element ref="xs:annotation" minOccurs="0"/> + </xs:sequence> + <xs:attribute name="value" type="xs:string" use="required"/> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + </xs:element> + +</xs:schema> diff --git a/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/datatypes.dtd b/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/datatypes.dtd new file mode 100644 index 000000000..130bc895e --- /dev/null +++ b/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/datatypes.dtd @@ -0,0 +1,250 @@ +<!-- + +W3C Software and Document Notice and License + +This work is being provided by the copyright holders under the following license. + +License + +By obtaining and/or copying this work, you (the licensee) agree that you have +read, understood, and will comply with the following terms and conditions. + +Permission to copy, modify, and distribute this work, with or without +modification, for any purpose and without fee or royalty is hereby granted, +provided that you include the following on ALL copies of the work or portions +thereof, including modifications: + +- The full text of this NOTICE in a location viewable to users of the + redistributed or derivative work. +- Any pre-existing intellectual property disclaimers, notices, or terms and + conditions. If none exist, the W3C Software and Document Short Notice should + be included. +- Notice of any changes or modifications, through a copyright statement on the + new code or document such as "This software or document includes material + copied from or derived from [title and URI of the W3C document]. + Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)." + +Disclaimers + +THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR + WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF +MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE +SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, +TRADEMARKS OR OTHER RIGHTS. + +COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT. + +The name and trademarks of copyright holders may NOT be used in advertising or +publicity pertaining to the work without specific, written prior permission. +Title to copyright in this work will at all times remain with copyright +holders. + +Changes: + +- Added license header + +--> +<!-- + DTD for XML Schemas: Part 2: Datatypes + $Id$ + Note this DTD is NOT normative, or even definitive. - - the + prose copy in the datatypes REC is the definitive version + (which shouldn't differ from this one except for this comment + and entity expansions, but just in case) + --> + +<!-- + This DTD cannot be used on its own, it is intended + only for incorporation in XMLSchema.dtd, q.v. + --> + +<!-- Define all the element names, with optional prefix --> +<!ENTITY % simpleType "%p;simpleType"> +<!ENTITY % restriction "%p;restriction"> +<!ENTITY % list "%p;list"> +<!ENTITY % union "%p;union"> +<!ENTITY % maxExclusive "%p;maxExclusive"> +<!ENTITY % minExclusive "%p;minExclusive"> +<!ENTITY % maxInclusive "%p;maxInclusive"> +<!ENTITY % minInclusive "%p;minInclusive"> +<!ENTITY % totalDigits "%p;totalDigits"> +<!ENTITY % fractionDigits "%p;fractionDigits"> +<!ENTITY % length "%p;length"> +<!ENTITY % minLength "%p;minLength"> +<!ENTITY % maxLength "%p;maxLength"> +<!ENTITY % enumeration "%p;enumeration"> +<!ENTITY % whiteSpace "%p;whiteSpace"> +<!ENTITY % pattern "%p;pattern"> + +<!-- + Customisation entities for the ATTLIST of each element + type. Define one of these if your schema takes advantage + of the anyAttribute='##other' in the schema for schemas + --> + +<!ENTITY % simpleTypeAttrs ""> +<!ENTITY % restrictionAttrs ""> +<!ENTITY % listAttrs ""> +<!ENTITY % unionAttrs ""> +<!ENTITY % maxExclusiveAttrs ""> +<!ENTITY % minExclusiveAttrs ""> +<!ENTITY % maxInclusiveAttrs ""> +<!ENTITY % minInclusiveAttrs ""> +<!ENTITY % totalDigitsAttrs ""> +<!ENTITY % fractionDigitsAttrs ""> +<!ENTITY % lengthAttrs ""> +<!ENTITY % minLengthAttrs ""> +<!ENTITY % maxLengthAttrs ""> +<!ENTITY % enumerationAttrs ""> +<!ENTITY % whiteSpaceAttrs ""> +<!ENTITY % patternAttrs ""> + +<!-- Define some entities for informative use as attribute + types --> +<!ENTITY % URIref "CDATA"> +<!ENTITY % XPathExpr "CDATA"> +<!ENTITY % QName "NMTOKEN"> +<!ENTITY % QNames "NMTOKENS"> +<!ENTITY % NCName "NMTOKEN"> +<!ENTITY % nonNegativeInteger "NMTOKEN"> +<!ENTITY % boolean "(true|false)"> +<!ENTITY % simpleDerivationSet "CDATA"> +<!-- + #all or space-separated list drawn from derivationChoice + --> + +<!-- + Note that the use of 'facet' below is less restrictive + than is really intended: There should in fact be no + more than one of each of minInclusive, minExclusive, + maxInclusive, maxExclusive, totalDigits, fractionDigits, + length, maxLength, minLength within datatype, + and the min- and max- variants of Inclusive and Exclusive + are mutually exclusive. On the other hand, pattern and + enumeration may repeat. + --> +<!ENTITY % minBound "(%minInclusive; | %minExclusive;)"> +<!ENTITY % maxBound "(%maxInclusive; | %maxExclusive;)"> +<!ENTITY % bounds "%minBound; | %maxBound;"> +<!ENTITY % numeric "%totalDigits; | %fractionDigits;"> +<!ENTITY % ordered "%bounds; | %numeric;"> +<!ENTITY % unordered + "%pattern; | %enumeration; | %whiteSpace; | %length; | + %maxLength; | %minLength;"> +<!ENTITY % facet "%ordered; | %unordered;"> +<!ENTITY % facetAttr + "value CDATA #REQUIRED + id ID #IMPLIED"> +<!ENTITY % fixedAttr "fixed %boolean; #IMPLIED"> +<!ENTITY % facetModel "(%annotation;)?"> +<!ELEMENT %simpleType; + ((%annotation;)?, (%restriction; | %list; | %union;))> +<!ATTLIST %simpleType; + name %NCName; #IMPLIED + final %simpleDerivationSet; #IMPLIED + id ID #IMPLIED + %simpleTypeAttrs;> +<!-- name is required at top level --> +<!ELEMENT %restriction; ((%annotation;)?, + (%restriction1; | + ((%simpleType;)?,(%facet;)*)), + (%attrDecls;))> +<!ATTLIST %restriction; + base %QName; #IMPLIED + id ID #IMPLIED + %restrictionAttrs;> +<!-- + base and simpleType child are mutually exclusive, + one is required. + + restriction is shared between simpleType and + simpleContent and complexContent (in XMLSchema.xsd). + restriction1 is for the latter cases, when this + is restricting a complex type, as is attrDecls. + --> +<!ELEMENT %list; ((%annotation;)?,(%simpleType;)?)> +<!ATTLIST %list; + itemType %QName; #IMPLIED + id ID #IMPLIED + %listAttrs;> +<!-- + itemType and simpleType child are mutually exclusive, + one is required + --> +<!ELEMENT %union; ((%annotation;)?,(%simpleType;)*)> +<!ATTLIST %union; + id ID #IMPLIED + memberTypes %QNames; #IMPLIED + %unionAttrs;> +<!-- + At least one item in memberTypes or one simpleType + child is required + --> + +<!ELEMENT %maxExclusive; %facetModel;> +<!ATTLIST %maxExclusive; + %facetAttr; + %fixedAttr; + %maxExclusiveAttrs;> +<!ELEMENT %minExclusive; %facetModel;> +<!ATTLIST %minExclusive; + %facetAttr; + %fixedAttr; + %minExclusiveAttrs;> + +<!ELEMENT %maxInclusive; %facetModel;> +<!ATTLIST %maxInclusive; + %facetAttr; + %fixedAttr; + %maxInclusiveAttrs;> +<!ELEMENT %minInclusive; %facetModel;> +<!ATTLIST %minInclusive; + %facetAttr; + %fixedAttr; + %minInclusiveAttrs;> + +<!ELEMENT %totalDigits; %facetModel;> +<!ATTLIST %totalDigits; + %facetAttr; + %fixedAttr; + %totalDigitsAttrs;> +<!ELEMENT %fractionDigits; %facetModel;> +<!ATTLIST %fractionDigits; + %facetAttr; + %fixedAttr; + %fractionDigitsAttrs;> + +<!ELEMENT %length; %facetModel;> +<!ATTLIST %length; + %facetAttr; + %fixedAttr; + %lengthAttrs;> +<!ELEMENT %minLength; %facetModel;> +<!ATTLIST %minLength; + %facetAttr; + %fixedAttr; + %minLengthAttrs;> +<!ELEMENT %maxLength; %facetModel;> +<!ATTLIST %maxLength; + %facetAttr; + %fixedAttr; + %maxLengthAttrs;> + +<!-- This one can be repeated --> +<!ELEMENT %enumeration; %facetModel;> +<!ATTLIST %enumeration; + %facetAttr; + %enumerationAttrs;> + +<!ELEMENT %whiteSpace; %facetModel;> +<!ATTLIST %whiteSpace; + %facetAttr; + %fixedAttr; + %whiteSpaceAttrs;> + +<!-- This one can be repeated --> +<!ELEMENT %pattern; %facetModel;> +<!ATTLIST %pattern; + %facetAttr; + %patternAttrs;> diff --git a/xml.catalog/test/qa-functional/data/Catalog/OASISCatalog.xml b/xml.catalog/test/qa-functional/data/Catalog/OASISCatalog.xml index a75b93565..bb381511c 100644 --- a/xml.catalog/test/qa-functional/data/Catalog/OASISCatalog.xml +++ b/xml.catalog/test/qa-functional/data/Catalog/OASISCatalog.xml @@ -1,3 +1,23 @@ +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"> <public publicId="public ID" uri="xmlcatdtd.dtd"/> diff --git a/xml.catalog/test/qa-functional/data/Catalog/catalog.dtd b/xml.catalog/test/qa-functional/data/Catalog/catalog.dtd index ac5c6a7ba..a0326d3d8 100644 --- a/xml.catalog/test/qa-functional/data/Catalog/catalog.dtd +++ b/xml.catalog/test/qa-functional/data/Catalog/catalog.dtd @@ -1,4 +1,34 @@ -<!-- --> +<!-- + +Copyright � 2000, 2001 The Organization for the Advancement of Structured +Information Standards [OASIS]. All Rights Reserved. + +This document and translations of it may be copied and furnished to others, and +derivative works that comment on or otherwise explain it or assist in its +implementation may be prepared, copied, published and distributed, in whole or +in part, without restriction of any kind, provided that the above copyright +notice and this paragraph are included on all such copies and derivative works. +However, this document itself may not be modified in any way, such as by +removing the copyright notice or references to OASIS, except as needed for the +purpose of developing OASIS specifications, in which case the procedures for +copyrights defined in the OASIS Intellectual Property Rights document must be +followed, or as required to translate it into languages other than English. + +The limited permissions granted above are perpetual and will not be revoked by +OASIS or its successors or assigns. + +This document and the information contained herein is provided on an "AS IS" +basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT +LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE +ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A +PARTICULAR PURPOSE. + +Original XSD can be found here: +https://www.oasis-open.org/committees/entity/spec-2001-08-06.html + +--> + +<!-- $Id: catalog.dtd,v 1.9 2001/06/12 14:26:00 ndw Exp $ --> <!ENTITY % pubIdChars "CDATA"> <!ENTITY % publicIdentifier "%pubIdChars;"> @@ -23,127 +53,95 @@ <!ENTITY % nextCatalog "%p;nextCatalog"> <!ENTITY % group "%p;group"> -<!ENTITY % local.catalog.mix ""> <!ENTITY % local.catalog.attribs ""> <!ELEMENT %catalog; (%public;|%system;|%uri; |%rewriteSystem;|%rewriteURI; |%delegatePublic;|%delegateSystem;|%delegateURI; - |%nextCatalog;|%group; %local.catalog.mix;)+> + |%nextCatalog;|%group;)+> <!ATTLIST %catalog; - %nsdecl; %uriReference; #FIXED - 'urn:oasis:names:tc:entity:xmlns:xml:catalog' - prefer %systemOrPublic; #IMPLIED - xml:base %uriReference; #IMPLIED - %local.catalog.attribs; + %nsdecl; %uriReference; #FIXED + 'urn:oasis:names:tc:entity:xmlns:xml:catalog' + prefer %systemOrPublic; #IMPLIED + xml:base %uriReference; #IMPLIED + %local.catalog.attribs; > -<!ENTITY % local.public.attribs ""> - <!ELEMENT %public; EMPTY> <!ATTLIST %public; - id ID #IMPLIED - publicId %publicIdentifier; #REQUIRED - uri %uriReference; #REQUIRED - xml:base %uriReference; #IMPLIED - %local.public.attribs; + id ID #IMPLIED + publicId %publicIdentifier; #REQUIRED + uri %uriReference; #REQUIRED + xml:base %uriReference; #IMPLIED > -<!ENTITY % local.system.attribs ""> - <!ELEMENT %system; EMPTY> <!ATTLIST %system; - id ID #IMPLIED - systemId %string; #REQUIRED - uri %uriReference; #REQUIRED - xml:base %uriReference; #IMPLIED - %local.system.attribs; + id ID #IMPLIED + systemId %string; #REQUIRED + uri %uriReference; #REQUIRED + xml:base %uriReference; #IMPLIED > -<!ENTITY % local.uri.attribs ""> - <!ELEMENT %uri; EMPTY> <!ATTLIST %uri; - id ID #IMPLIED - name %string; #REQUIRED - uri %uriReference; #REQUIRED - xml:base %uriReference; #IMPLIED - %local.uri.attribs; + id ID #IMPLIED + name %string; #REQUIRED + uri %uriReference; #REQUIRED + xml:base %uriReference; #IMPLIED > -<!ENTITY % local.rewriteSystem.attribs ""> - <!ELEMENT %rewriteSystem; EMPTY> <!ATTLIST %rewriteSystem; - id ID #IMPLIED - systemIdStartString %string; #REQUIRED - rewritePrefix %string; #REQUIRED - %local.rewriteSystem.attribs; + id ID #IMPLIED + systemIdStartString %string; #REQUIRED + rewritePrefix %string; #REQUIRED > -<!ENTITY % local.rewriteURI.attribs ""> - <!ELEMENT %rewriteURI; EMPTY> <!ATTLIST %rewriteURI; - id ID #IMPLIED - uriStartString %string; #REQUIRED - rewritePrefix %string; #REQUIRED - %local.rewriteURI.attribs; + id ID #IMPLIED + uriStartString %string; #REQUIRED + rewritePrefix %string; #REQUIRED > -<!ENTITY % local.delegatePublic.attribs ""> - <!ELEMENT %delegatePublic; EMPTY> <!ATTLIST %delegatePublic; - id ID #IMPLIED - publicIdStartString %partialPublicIdentifier; #REQUIRED - catalog %uriReference; #REQUIRED - xml:base %uriReference; #IMPLIED - %local.delegatePublic.attribs; + id ID #IMPLIED + publicIdStartString %partialPublicIdentifier; #REQUIRED + catalog %uriReference; #REQUIRED + xml:base %uriReference; #IMPLIED > -<!ENTITY % local.delegateSystem.attribs ""> - <!ELEMENT %delegateSystem; EMPTY> <!ATTLIST %delegateSystem; - id ID #IMPLIED - systemIdStartString %string; #REQUIRED - catalog %uriReference; #REQUIRED - xml:base %uriReference; #IMPLIED - %local.delegateSystem.attribs; + id ID #IMPLIED + systemIdStartString %string; #REQUIRED + catalog %uriReference; #REQUIRED + xml:base %uriReference; #IMPLIED > -<!ENTITY % local.delegateURI.attribs ""> - <!ELEMENT %delegateURI; EMPTY> <!ATTLIST %delegateURI; - id ID #IMPLIED - uriStartString %string; #REQUIRED - catalog %uriReference; #REQUIRED - xml:base %uriReference; #IMPLIED - %local.delegateURI.attribs; + id ID #IMPLIED + uriStartString %string; #REQUIRED + catalog %uriReference; #REQUIRED + xml:base %uriReference; #IMPLIED > -<!ENTITY % local.nextCatalog.attribs ""> - <!ELEMENT %nextCatalog; EMPTY> <!ATTLIST %nextCatalog; - id ID #IMPLIED - catalog %uriReference; #REQUIRED - xml:base %uriReference; #IMPLIED - %local.nextCatalog.attribs; + id ID #IMPLIED + catalog %uriReference; #REQUIRED + xml:base %uriReference; #IMPLIED > -<!ENTITY % local.group.mix ""> -<!ENTITY % local.group.attribs ""> - <!ELEMENT %group; (%public;|%system;|%uri; |%rewriteSystem;|%rewriteURI; |%delegatePublic;|%delegateSystem;|%delegateURI; - |%nextCatalog; %local.group.mix;)+> + |%nextCatalog;)+> <!ATTLIST %group; - id ID #IMPLIED - prefer %systemOrPublic; #IMPLIED - xml:base %uriReference; #IMPLIED - %local.group.attribs; -> + id ID #IMPLIED + prefer %systemOrPublic; #IMPLIED + xml:base %uriReference; #IMPLIED +> \ No newline at end of file diff --git a/xml.catalog/test/qa-functional/data/Catalog/catalog.xsd b/xml.catalog/test/qa-functional/data/Catalog/catalog.xsd index a987e3c37..3c6974dd8 100644 --- a/xml.catalog/test/qa-functional/data/Catalog/catalog.xsd +++ b/xml.catalog/test/qa-functional/data/Catalog/catalog.xsd @@ -1,22 +1,53 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- + +Copyright � 2000, 2001 The Organization for the Advancement of Structured +Information Standards [OASIS]. All Rights Reserved. + +This document and translations of it may be copied and furnished to others, and +derivative works that comment on or otherwise explain it or assist in its +implementation may be prepared, copied, published and distributed, in whole or +in part, without restriction of any kind, provided that the above copyright +notice and this paragraph are included on all such copies and derivative works. +However, this document itself may not be modified in any way, such as by +removing the copyright notice or references to OASIS, except as needed for the +purpose of developing OASIS specifications, in which case the procedures for +copyrights defined in the OASIS Intellectual Property Rights document must be +followed, or as required to translate it into languages other than English. + +The limited permissions granted above are perpetual and will not be revoked by +OASIS or its successors or assigns. + +This document and the information contained herein is provided on an "AS IS" +basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT +LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE +ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A +PARTICULAR PURPOSE. + +Original XSD can be found here: +https://www.oasis-open.org/committees/entity/spec-2001-08-06.html + +--> +<!DOCTYPE xs:schema SYSTEM "http://www.w3.org/2001/XMLSchema.dtd" [ +<!ENTITY % schemaAttrs " + xmlns:er CDATA #IMPLIED +"> +]> <xs:schema xmlns:xs='http://www.w3.org/2001/XMLSchema' xmlns:er='urn:oasis:names:tc:entity:xmlns:xml:catalog' targetNamespace='urn:oasis:names:tc:entity:xmlns:xml:catalog' elementFormDefault='qualified'> - <!-- --> + <!-- $Id: catalog.xsd,v 1.9 2001/07/30 19:40:04 ndw Exp $ --> <xs:simpleType name='pubIdChars'> <!-- A string of the characters defined as pubIdChar in production 13 - of the Second Edition of the XML 1.0 Recommendation. Does not include - the whitespace characters because they're normalized by XML parsing. --> - <xs:restriction base='xs:string'> - <xs:pattern value="[a-zA-Z0-9-'()+,./:=?;!*#@$_%]*"/> - </xs:restriction> + of the Second Edition of the XML 1.0 Recommendation --> + <xs:restriction base='xs:string'/> </xs:simpleType> <xs:simpleType name='publicIdentifier'> - <xs:restriction base='er:pubIdChars'/> + <xs:restriction base='xs:string'/> </xs:simpleType> <xs:simpleType name='partialPublicIdentifier'> @@ -193,4 +224,4 @@ <xs:element name="nextCatalog" type="er:nextCatalog"/> <xs:element name="group" type="er:group"/> -</xs:schema> +</xs:schema> \ No newline at end of file diff --git a/xml.catalog/test/unit/src/org/netbeans/modules/xml/catalog/impl/sun/data/a space/empty.dtd b/xml.catalog/test/unit/src/org/netbeans/modules/xml/catalog/impl/sun/data/a space/empty.dtd index e126f849e..7a6f992cc 100644 --- a/xml.catalog/test/unit/src/org/netbeans/modules/xml/catalog/impl/sun/data/a space/empty.dtd +++ b/xml.catalog/test/unit/src/org/netbeans/modules/xml/catalog/impl/sun/data/a space/empty.dtd @@ -1 +1,21 @@ +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- EMPTY --> diff --git a/xml.catalog/test/unit/src/org/netbeans/modules/xml/catalog/impl/sun/data/catalog.xml b/xml.catalog/test/unit/src/org/netbeans/modules/xml/catalog/impl/sun/data/catalog.xml index f2b88e223..4e72c018d 100644 --- a/xml.catalog/test/unit/src/org/netbeans/modules/xml/catalog/impl/sun/data/catalog.xml +++ b/xml.catalog/test/unit/src/org/netbeans/modules/xml/catalog/impl/sun/data/catalog.xml @@ -1,5 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- Tests treating of spaces in catalog paths. Three URL space syntaxes are supported: diff --git a/xml.catalog/test/unit/src/org/netbeans/modules/xml/catalog/impl/sun/data/empty.dtd b/xml.catalog/test/unit/src/org/netbeans/modules/xml/catalog/impl/sun/data/empty.dtd index e126f849e..7a6f992cc 100644 --- a/xml.catalog/test/unit/src/org/netbeans/modules/xml/catalog/impl/sun/data/empty.dtd +++ b/xml.catalog/test/unit/src/org/netbeans/modules/xml/catalog/impl/sun/data/empty.dtd @@ -1 +1,21 @@ +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- EMPTY --> diff --git a/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/data.properties b/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/data.properties index ec60222cf..dd5c49660 100644 --- a/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/data.properties +++ b/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/data.properties @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. short_encoding.xml=ISO-8859-1 long_encoding.xml=ISO-8859-2 short_no_encoding.xml=<null> diff --git a/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/illegal_encoding.xml b/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/illegal_encoding.xml index f78722e62..3efeac605 100644 --- a/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/illegal_encoding.xml +++ b/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/illegal_encoding.xml @@ -1,4 +1,24 @@ <?xml version='1.0' encoding='$$$' ?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <root> Short XML file test. </root> diff --git a/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/long_encoding.xml b/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/long_encoding.xml index 7747d8559..8ed6e2b5d 100644 --- a/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/long_encoding.xml +++ b/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/long_encoding.xml @@ -1,5 +1,24 @@ <?xml version="1.0" encoding="ISO-8859-2"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- Document : long_encoding.xml.xml Created on : October 8, 2007, 6:03 PM diff --git a/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/long_no_encoding.xml b/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/long_no_encoding.xml index a1003f7b9..921917082 100644 --- a/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/long_no_encoding.xml +++ b/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/long_no_encoding.xml @@ -1,3 +1,23 @@ +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- Document : long_encoding.xml.xml diff --git a/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/short_encoding.xml b/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/short_encoding.xml index aba0581ff..51fcbf79e 100644 --- a/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/short_encoding.xml +++ b/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/short_encoding.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <root> Short XML file test. </root> diff --git a/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/short_no_encoding.xml b/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/short_no_encoding.xml index 1a36aad17..7274fa0cd 100644 --- a/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/short_no_encoding.xml +++ b/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/short_no_encoding.xml @@ -1,3 +1,23 @@ +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <root> Short XML file test. </root> diff --git a/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/unsupported_encoding.xml b/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/unsupported_encoding.xml index d409ed446..b3af87595 100644 --- a/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/unsupported_encoding.xml +++ b/xml.core/test/unit/src/org/netbeans/modules/xml/api/data/unsupported_encoding.xml @@ -1,4 +1,24 @@ <?xml version='1.0' encoding='unknown' ?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <root> Short XML file test. </root> diff --git a/xml.core/test/unit/src/org/netbeans/modules/xml/dtd/grammar/email.xml b/xml.core/test/unit/src/org/netbeans/modules/xml/dtd/grammar/email.xml index dcce61693..b6ccee802 100644 --- a/xml.core/test/unit/src/org/netbeans/modules/xml/dtd/grammar/email.xml +++ b/xml.core/test/unit/src/org/netbeans/modules/xml/dtd/grammar/email.xml @@ -1,5 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!DOCTYPE email SYSTEM "email.dtd" [ <!ELEMENT testANYElement ANY> <!NOTATION testNotation PUBLIC "not-pub" "not-sys"> diff --git a/xml.jaxb.api/external/binaries-list b/xml.jaxb.api/external/binaries-list index 443aec376..7b95e38c7 100644 --- a/xml.jaxb.api/external/binaries-list +++ b/xml.jaxb.api/external/binaries-list @@ -14,6 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -E1233CB9A6101F5CC1098AC26AD6D11ADB1ABFA2 activation.jar -71F434378F822B09A57174AF6C75D37408687C57 jaxb-api.jar -3BD00A1595529E6A43F2118B551A9CA906BE4CF3 jsr173_1.0_api.jar +485DE3A253E23F645037828C07F1D7F1AF40763A javax.activation:activation:1.1.1 +71F434378F822B09A57174AF6C75D37408687C57 javax.xml.bind:jaxb-api:2.2.6 diff --git a/xml.jaxb.api/external/jaxb-2.2.5-license.txt b/xml.jaxb.api/external/jaxb-2.2.6-license.txt similarity index 99% rename from xml.jaxb.api/external/jaxb-2.2.5-license.txt rename to xml.jaxb.api/external/jaxb-2.2.6-license.txt index 6204f5666..80792e7da 100644 --- a/xml.jaxb.api/external/jaxb-2.2.5-license.txt +++ b/xml.jaxb.api/external/jaxb-2.2.6-license.txt @@ -1,10 +1,10 @@ Name: JAXB -Version: 2.2.5 +Version: 2.2.6 Description: JAXB Reference Implementation License: CDDL-1.1, GPLv2 OSR: 4116 Origin: https://jaxb.java.net/ -Files: activation.jar jaxb-api.jar jsr173_api.jar +Files: activation-1.1.1.jar jaxb-api-2.2.6.jar COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.1 @@ -304,7 +304,7 @@ COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.1 The Covered Software is a "commercial item," as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer - software" (as that term is defined at 48 C.F.R. � 252.227-7014(a)(1)) + software" (as that term is defined at 48 C.F.R. � 252.227-7014(a)(1)) and "commercial computer software documentation" as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government diff --git a/xml.jaxb.api/nbproject/project.properties b/xml.jaxb.api/nbproject/project.properties index ec5f39db8..6b59ee426 100644 --- a/xml.jaxb.api/nbproject/project.properties +++ b/xml.jaxb.api/nbproject/project.properties @@ -19,11 +19,9 @@ is.autoload=true jnlp.indirect.jars=\ modules/ext/jaxb/activation.jar,\ - modules/ext/jaxb/api/jaxb-api.jar,\ - modules/ext/jaxb/api/jsr173_1.0_api.jar + modules/ext/jaxb/api/jaxb-api.jar -release.external/activation.jar=modules/ext/jaxb/activation.jar -release.external/jaxb-api.jar=modules/ext/jaxb/api/jaxb-api.jar -release.external/jsr173_1.0_api.jar=modules/ext/jaxb/api/jsr173_1.0_api.jar +release.external/activation-1.1.1.jar=modules/ext/jaxb/activation.jar +release.external/jaxb-api-2.2.6.jar=modules/ext/jaxb/api/jaxb-api.jar sigtest.gen.fail.on.error=false diff --git a/xml.jaxb.api/src/org/netbeans/modules/xml/jaxb/api/Bundle.properties b/xml.jaxb.api/src/org/netbeans/modules/xml/jaxb/api/Bundle.properties index 70bc42a0d..42eb7fa57 100644 --- a/xml.jaxb.api/src/org/netbeans/modules/xml/jaxb/api/Bundle.properties +++ b/xml.jaxb.api/src/org/netbeans/modules/xml/jaxb/api/Bundle.properties @@ -1,45 +1,19 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. +# http://www.apache.org/licenses/LICENSE-2.0 # -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# Contributor(s): -# -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. -# Sample ResourceBundle properties file +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. OpenIDE-Module-Name=JAXB API diff --git a/xml.lexer/test/unit/src/org/netbeans/api/xml/lexer/XMLTokenIdTest.java b/xml.lexer/test/unit/src/org/netbeans/api/xml/lexer/XMLTokenIdTest.java index 6d1f4275d..829a7ceff 100644 --- a/xml.lexer/test/unit/src/org/netbeans/api/xml/lexer/XMLTokenIdTest.java +++ b/xml.lexer/test/unit/src/org/netbeans/api/xml/lexer/XMLTokenIdTest.java @@ -35,11 +35,13 @@ public static Test suite() { TestSuite suite = new TestSuite(); suite.addTest(new XMLTokenIdTest("testTokens")); //regression tests on XMLLexer - suite.addTest(new XMLTokenIdTest("testParse1")); +// Disabled as referenced files were partly not donated by oracle to apache +// suite.addTest(new XMLTokenIdTest("testParse1")); suite.addTest(new XMLTokenIdTest("testParse2")); suite.addTest(new XMLTokenIdTest("testParse3")); //measure performace - suite.addTest(new XMLTokenIdTest("testParsePerformance")); +// Disabled as referenced files were partly not donated by oracle to apache +// suite.addTest(new XMLTokenIdTest("testParsePerformance")); return suite; } diff --git a/xml.multiview/src/org/netbeans/modules/xml/multiview/Bundle.properties b/xml.multiview/src/org/netbeans/modules/xml/multiview/Bundle.properties index 25df3979a..d6b2c87de 100644 --- a/xml.multiview/src/org/netbeans/modules/xml/multiview/Bundle.properties +++ b/xml.multiview/src/org/netbeans/modules/xml/multiview/Bundle.properties @@ -1,44 +1,19 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. +# http://www.apache.org/licenses/LICENSE-2.0 # -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# Contributor(s): -# -# The Original Software is Forte for Java, Community Edition. The Initial -# Developer of the Original Software is Sun Microsystems, Inc. Portions -# Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. # Module manifest localization OpenIDE-Module-Name=XML Multiview Editor diff --git a/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/Bundle.properties b/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/Bundle.properties index 86b76a7cb..e37b3de2d 100644 --- a/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/Bundle.properties +++ b/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/Bundle.properties @@ -1,46 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -# -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. -# -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# Contributor(s): -# -# The Original Software is Forte for Java, Community Edition. The Initial -# Developer of the Original Software is Sun Microsystems, Inc. Portions -# Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. +# http://www.apache.org/licenses/LICENSE-2.0 # +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. LBL_Add=&Add... HINT_Add=Add diff --git a/xml.multiview/test/unit/data/goldenfiles/org/netbeans/modules/xml/multiview/test/XmlMultiViewEditorTest/ChangedChapterLength.pass b/xml.multiview/test/unit/data/goldenfiles/org/netbeans/modules/xml/multiview/test/XmlMultiViewEditorTest/ChangedChapterLength.pass index 0450fe19a..e3c7d2738 100644 --- a/xml.multiview/test/unit/data/goldenfiles/org/netbeans/modules/xml/multiview/test/XmlMultiViewEditorTest/ChangedChapterLength.pass +++ b/xml.multiview/test/unit/data/goldenfiles/org/netbeans/modules/xml/multiview/test/XmlMultiViewEditorTest/ChangedChapterLength.pass @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!DOCTYPE book PUBLIC "-//BookCompany//Entity ID//EN" "file://book.dtd"> <book instock="yes"> <title lang="en">A bean on the beach</title> diff --git a/xml.multiview/test/unit/data/goldenfiles/org/netbeans/modules/xml/multiview/test/XmlMultiViewEditorTest/ChangedChapterTitle.pass b/xml.multiview/test/unit/data/goldenfiles/org/netbeans/modules/xml/multiview/test/XmlMultiViewEditorTest/ChangedChapterTitle.pass index 480a29080..6b625864a 100644 --- a/xml.multiview/test/unit/data/goldenfiles/org/netbeans/modules/xml/multiview/test/XmlMultiViewEditorTest/ChangedChapterTitle.pass +++ b/xml.multiview/test/unit/data/goldenfiles/org/netbeans/modules/xml/multiview/test/XmlMultiViewEditorTest/ChangedChapterTitle.pass @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!DOCTYPE book PUBLIC "-//BookCompany//Entity ID//EN" "file://book.dtd"> <book instock="yes"> <title lang="en">A bean on the beach</title> diff --git a/xml.multiview/test/unit/data/sample.book b/xml.multiview/test/unit/data/sample.book index 798e811ed..fe9ea96f0 100644 --- a/xml.multiview/test/unit/data/sample.book +++ b/xml.multiview/test/unit/data/sample.book @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!DOCTYPE book PUBLIC "-//BookCompany//Entity ID//EN" "file://sample.dtd"> <book instock="yes"> <title lang="en">A bean on the beach</title> diff --git a/xml.retriever/test/unit/src/org/netbeans/modules/xml/retriever/catalog/impl/catalog.xml b/xml.retriever/test/unit/src/org/netbeans/modules/xml/retriever/catalog/impl/catalog.xml index cc84b1e68..70a741909 100644 --- a/xml.retriever/test/unit/src/org/netbeans/modules/xml/retriever/catalog/impl/catalog.xml +++ b/xml.retriever/test/unit/src/org/netbeans/modules/xml/retriever/catalog/impl/catalog.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="system"> <system referencingFile="refFileAttr" systemId="sysIDAttr" uri="uriAttr" xprojectCatalogFileLocation="xprojCatRefAttr"/> <nextCatalog catalog="catalogAttr"/> diff --git a/xml.retriever/test/unit/src/org/netbeans/modules/xml/retriever/catalog/impl/dummyFile.txt b/xml.retriever/test/unit/src/org/netbeans/modules/xml/retriever/catalog/impl/dummyFile.txt index e69de29bb..b65e1dada 100644 --- a/xml.retriever/test/unit/src/org/netbeans/modules/xml/retriever/catalog/impl/dummyFile.txt +++ b/xml.retriever/test/unit/src/org/netbeans/modules/xml/retriever/catalog/impl/dummyFile.txt @@ -0,0 +1,21 @@ +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +Dummy File \ No newline at end of file diff --git a/xml.retriever/test/unit/src/org/netbeans/modules/xml/retriever/catalog/model/catalog.xml b/xml.retriever/test/unit/src/org/netbeans/modules/xml/retriever/catalog/model/catalog.xml index cc84b1e68..70a741909 100644 --- a/xml.retriever/test/unit/src/org/netbeans/modules/xml/retriever/catalog/model/catalog.xml +++ b/xml.retriever/test/unit/src/org/netbeans/modules/xml/retriever/catalog/model/catalog.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="system"> <system referencingFile="refFileAttr" systemId="sysIDAttr" uri="uriAttr" xprojectCatalogFileLocation="xprojCatRefAttr"/> <nextCatalog catalog="catalogAttr"/> diff --git a/xml.retriever/test/unit/src/org/netbeans/modules/xml/retriever/catalog/model/empty.xml b/xml.retriever/test/unit/src/org/netbeans/modules/xml/retriever/catalog/model/empty.xml index da480cf3b..82087b93d 100644 --- a/xml.retriever/test/unit/src/org/netbeans/modules/xml/retriever/catalog/model/empty.xml +++ b/xml.retriever/test/unit/src/org/netbeans/modules/xml/retriever/catalog/model/empty.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="system"> <system systemId="dummy/dummy" uri="file:/D:/workspace/release551/xml/retriever/build/test/unit/classes/org/netbeans/modules/xml/retriever/catalog/impl/dummyFile.txt"/> </catalog> diff --git a/xml.schema.completion/src/org/netbeans/modules/xml/schema/completion/util/XMLSchema.xsd b/xml.schema.completion/src/org/netbeans/modules/xml/schema/completion/util/XMLSchema.xsd index 608a24d3b..7430b637d 100644 --- a/xml.schema.completion/src/org/netbeans/modules/xml/schema/completion/util/XMLSchema.xsd +++ b/xml.schema.completion/src/org/netbeans/modules/xml/schema/completion/util/XMLSchema.xsd @@ -1,2163 +1,1605 @@ <?xml version='1.0' encoding='UTF-8'?> - -<xs:schema targetNamespace="http://www.w3.org/2001/XMLSchema" -blockDefault="#all" -elementFormDefault="qualified" version="1.0" -xmlns:xs="http://www.w3.org/2001/XMLSchema" -xml:lang="EN" xmlns:hfp="http://www.w3.org/2001/XMLSchema-hasFacetAndProperty"> +<!-- + +W3C Software and Document Notice and License + +This work is being provided by the copyright holders under the following license. + +License + +By obtaining and/or copying this work, you (the licensee) agree that you have +read, understood, and will comply with the following terms and conditions. + +Permission to copy, modify, and distribute this work, with or without +modification, for any purpose and without fee or royalty is hereby granted, +provided that you include the following on ALL copies of the work or portions +thereof, including modifications: + +- The full text of this NOTICE in a location viewable to users of the + redistributed or derivative work. +- Any pre-existing intellectual property disclaimers, notices, or terms and + conditions. If none exist, the W3C Software and Document Short Notice should + be included. +- Notice of any changes or modifications, through a copyright statement on the + new code or document such as "This software or document includes material + copied from or derived from [title and URI of the W3C document]. + Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)." + +Disclaimers + +THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR + WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF +MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE +SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, +TRADEMARKS OR OTHER RIGHTS. + +COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT. + +The name and trademarks of copyright holders may NOT be used in advertising or +publicity pertaining to the work without specific, written prior permission. +Title to copyright in this work will at all times remain with copyright +holders. + +Changes: + +- File fetched from https://www.w3.org/2009/XMLSchema/XMLSchema.xsd +- Added license header + +--> +<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XSD 1.1//EN" "XMLSchema.dtd" [ + +<!-- provide ID type information even for parsers which only read the + internal subset --> +<!ATTLIST xs:schema id ID #IMPLIED> +<!ATTLIST xs:complexType id ID #IMPLIED> +<!ATTLIST xs:complexContent id ID #IMPLIED> +<!ATTLIST xs:simpleContent id ID #IMPLIED> +<!ATTLIST xs:extension id ID #IMPLIED> +<!ATTLIST xs:element id ID #IMPLIED> +<!ATTLIST xs:group id ID #IMPLIED> +<!ATTLIST xs:all id ID #IMPLIED> +<!ATTLIST xs:choice id ID #IMPLIED> +<!ATTLIST xs:sequence id ID #IMPLIED> +<!ATTLIST xs:any id ID #IMPLIED> +<!ATTLIST xs:anyAttribute id ID #IMPLIED> +<!ATTLIST xs:attribute id ID #IMPLIED> +<!ATTLIST xs:attributeGroup id ID #IMPLIED> +<!ATTLIST xs:unique id ID #IMPLIED> +<!ATTLIST xs:key id ID #IMPLIED> +<!ATTLIST xs:keyref id ID #IMPLIED> +<!ATTLIST xs:selector id ID #IMPLIED> +<!ATTLIST xs:field id ID #IMPLIED> +<!ATTLIST xs:assert id ID #IMPLIED> +<!ATTLIST xs:include id ID #IMPLIED> +<!ATTLIST xs:import id ID #IMPLIED> +<!ATTLIST xs:redefine id ID #IMPLIED> +<!ATTLIST xs:override id ID #IMPLIED> +<!ATTLIST xs:notation id ID #IMPLIED> +<!-- + Make sure that processors that do not read the external + subset will know about the various IDs we declare + --> + <!ATTLIST xs:simpleType id ID #IMPLIED> + <!ATTLIST xs:maxExclusive id ID #IMPLIED> + <!ATTLIST xs:minExclusive id ID #IMPLIED> + <!ATTLIST xs:maxInclusive id ID #IMPLIED> + <!ATTLIST xs:minInclusive id ID #IMPLIED> + <!ATTLIST xs:totalDigits id ID #IMPLIED> + <!ATTLIST xs:fractionDigits id ID #IMPLIED> + <!ATTLIST xs:length id ID #IMPLIED> + <!ATTLIST xs:minLength id ID #IMPLIED> + <!ATTLIST xs:maxLength id ID #IMPLIED> + <!ATTLIST xs:enumeration id ID #IMPLIED> + <!ATTLIST xs:pattern id ID #IMPLIED> + <!ATTLIST xs:assertion id ID #IMPLIED> + <!ATTLIST xs:explicitTimezone id ID #IMPLIED> + <!ATTLIST xs:appinfo id ID #IMPLIED> + <!ATTLIST xs:documentation id ID #IMPLIED> + <!ATTLIST xs:list id ID #IMPLIED> + <!ATTLIST xs:union id ID #IMPLIED> + ]> + +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" + elementFormDefault="qualified" xml:lang="EN" + targetNamespace="http://www.w3.org/2001/XMLSchema" + version="1.0"> <xs:annotation> <xs:documentation> - Part 1 version: Id: structures.xsd,v 1.2 2004/01/15 11:34:25 ht Exp - Part 2 version: Id: datatypes.xsd,v 1.3 2004/01/23 18:11:13 ht Exp + Part 1 version: structures.xsd (rec-20120405) + Part 2 version: datatypes.xsd (rec-20120405) </xs:documentation> </xs:annotation> - <xs:annotation> - <xs:documentation source="http://www.w3.org/TR/2004/PER-xmlschema-1-20040318/structures.html"> + <xs:annotation> + <xs:documentation source="../structures/structures.html"> The schema corresponding to this document is normative, with respect to the syntactic constraints it expresses in the - XML Schema language. The documentation (within &lt;documentation> elements) + XML Schema Definition Language. The documentation (within 'documentation' elements) below, is not normative, but rather highlights important aspects of - the W3C Recommendation of which this is a part</xs:documentation> - </xs:annotation> + the W3C Recommendation of which this is a part. - <xs:annotation> - <xs:documentation> + See below (at the bottom of this document) for information about + the revision and namespace-versioning policy governing this + schema document. + + </xs:documentation> + </xs:annotation> + <xs:annotation> + <xs:documentation> The simpleType element and all of its members are defined - towards the end of this schema document</xs:documentation> + towards the end of this schema document.</xs:documentation> </xs:annotation> - - <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"> - <xs:annotation> - <xs:documentation> + <xs:import namespace="http://www.w3.org/XML/1998/namespace" + schemaLocation="http://www.w3.org/2001/xml.xsd"> + <xs:annotation> + <xs:documentation> Get access to the xml: attribute groups for xml:lang as declared on 'schema' and 'documentation' below </xs:documentation> - </xs:annotation> - </xs:import> - - <xs:complexType name="openAttrs"> - <xs:annotation> - <xs:documentation> + </xs:annotation> + </xs:import> + <xs:complexType name="openAttrs"> + <xs:annotation> + <xs:documentation> This type is extended by almost all schema types to allow attributes from other namespaces to be added to user schemas. </xs:documentation> - </xs:annotation> - <xs:complexContent> - <xs:restriction base="xs:anyType"> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:restriction> - </xs:complexContent> - </xs:complexType> - - <xs:complexType name="annotated"> - <xs:annotation> - <xs:documentation> + </xs:annotation> + <xs:complexContent> + <xs:restriction base="xs:anyType"> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="annotated"> + <xs:annotation> + <xs:documentation> This type is extended by all types which allow annotation - other than &lt;schema&gt; itself + other than &lt;schema> itself </xs:documentation> - </xs:annotation> - <xs:complexContent> - <xs:extension base="xs:openAttrs"> - <xs:sequence> - <xs:element ref="xs:annotation" minOccurs="0"/> - </xs:sequence> - <xs:attribute name="id" type="xs:ID"/> - </xs:extension> - </xs:complexContent> - </xs:complexType> - - <xs:group name="schemaTop"> - <xs:annotation> - <xs:documentation> + </xs:annotation> + <xs:complexContent> + <xs:extension base="xs:openAttrs"> + <xs:sequence> + <xs:element ref="xs:annotation" minOccurs="0"/> + </xs:sequence> + <xs:attribute name="id" type="xs:ID"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:group name="composition"> + <xs:choice> + <xs:element ref="xs:include"/> + <xs:element ref="xs:import"/> + <xs:element ref="xs:redefine"/> + <xs:element ref="xs:override"/> + <xs:element ref="xs:annotation"/> + </xs:choice> + </xs:group> + <xs:group name="schemaTop"> + <xs:annotation> + <xs:documentation> This group is for the elements which occur freely at the top level of schemas. All of their types are based on the "annotated" type by extension.</xs:documentation> - </xs:annotation> - <xs:choice> - <xs:group ref="xs:redefinable"/> - <xs:element ref="xs:element"/> - <xs:element ref="xs:attribute"/> - <xs:element ref="xs:notation"/> - </xs:choice> - </xs:group> - - <xs:group name="redefinable"> - <xs:annotation> - <xs:documentation> + </xs:annotation> + <xs:choice> + <xs:group ref="xs:redefinable"/> + <xs:element ref="xs:element"/> + <xs:element ref="xs:attribute"/> + <xs:element ref="xs:notation"/> + </xs:choice> + </xs:group> + <xs:group name="redefinable"> + <xs:annotation> + <xs:documentation> This group is for the elements which can self-redefine (see &lt;redefine> below).</xs:documentation> - </xs:annotation> - <xs:choice> - <xs:element ref="xs:simpleType"/> - <xs:element ref="xs:complexType"/> - <xs:element ref="xs:group"/> - <xs:element ref="xs:attributeGroup"/> - </xs:choice> - </xs:group> - - <xs:simpleType name="formChoice"> - <xs:annotation> - <xs:documentation> + </xs:annotation> + <xs:choice> + <xs:element ref="xs:simpleType"/> + <xs:element ref="xs:complexType"/> + <xs:element ref="xs:group"/> + <xs:element ref="xs:attributeGroup"/> + </xs:choice> + </xs:group> + <xs:simpleType name="formChoice"> + <xs:annotation> + <xs:documentation> A utility type, not for public use</xs:documentation> - </xs:annotation> - <xs:restriction base="xs:NMTOKEN"> - <xs:enumeration value="qualified"/> - <xs:enumeration value="unqualified"/> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="reducedDerivationControl"> - <xs:annotation> - <xs:documentation> + </xs:annotation> + <xs:restriction base="xs:NMTOKEN"> + <xs:enumeration value="qualified"/> + <xs:enumeration value="unqualified"/> + </xs:restriction> + </xs:simpleType> + <xs:simpleType name="reducedDerivationControl"> + <xs:annotation> + <xs:documentation> A utility type, not for public use</xs:documentation> - </xs:annotation> - <xs:restriction base="xs:derivationControl"> - <xs:enumeration value="extension"/> - <xs:enumeration value="restriction"/> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="derivationSet"> - <xs:annotation> - <xs:documentation> + </xs:annotation> + <xs:restriction base="xs:derivationControl"> + <xs:enumeration value="extension"/> + <xs:enumeration value="restriction"/> + </xs:restriction> + </xs:simpleType> + <xs:simpleType name="derivationSet"> + <xs:annotation> + <xs:documentation> A utility type, not for public use</xs:documentation> - <xs:documentation> + <xs:documentation> #all or (possibly empty) subset of {extension, restriction}</xs:documentation> - </xs:annotation> - <xs:union> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="#all"/> - </xs:restriction> - </xs:simpleType> - <xs:simpleType> - <xs:list itemType="xs:reducedDerivationControl"/> - </xs:simpleType> - </xs:union> - </xs:simpleType> - - <xs:simpleType name="typeDerivationControl"> - <xs:annotation> - <xs:documentation> + </xs:annotation> + <xs:union> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="#all"/> + </xs:restriction> + </xs:simpleType> + <xs:simpleType> + <xs:list itemType="xs:reducedDerivationControl"/> + </xs:simpleType> + </xs:union> + </xs:simpleType> + <xs:simpleType name="typeDerivationControl"> + <xs:annotation> + <xs:documentation> A utility type, not for public use</xs:documentation> - </xs:annotation> - <xs:restriction base="xs:derivationControl"> - <xs:enumeration value="extension"/> - <xs:enumeration value="restriction"/> - <xs:enumeration value="list"/> - <xs:enumeration value="union"/> - </xs:restriction> - </xs:simpleType> - + </xs:annotation> + <xs:restriction base="xs:derivationControl"> + <xs:enumeration value="extension"/> + <xs:enumeration value="restriction"/> + <xs:enumeration value="list"/> + <xs:enumeration value="union"/> + </xs:restriction> + </xs:simpleType> <xs:simpleType name="fullDerivationSet"> - <xs:annotation> - <xs:documentation> + <xs:annotation> + <xs:documentation> A utility type, not for public use</xs:documentation> - <xs:documentation> + <xs:documentation> #all or (possibly empty) subset of {extension, restriction, list, union}</xs:documentation> - </xs:annotation> - <xs:union> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="#all"/> - </xs:restriction> - </xs:simpleType> - <xs:simpleType> - <xs:list itemType="xs:typeDerivationControl"/> - </xs:simpleType> - </xs:union> - </xs:simpleType> - - <xs:element name="schema" id="schema"> - <xs:annotation> - <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-schema"/> - </xs:annotation> - <xs:complexType> - <xs:complexContent> - <xs:extension base="xs:openAttrs"> - <xs:sequence> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="xs:include"/> - <xs:element ref="xs:import"/> - <xs:element ref="xs:redefine"/> - <xs:element ref="xs:annotation"/> - </xs:choice> - <xs:sequence minOccurs="0" maxOccurs="unbounded"> - <xs:group ref="xs:schemaTop"/> - <xs:element ref="xs:annotation" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - </xs:sequence> - <xs:attribute name="targetNamespace" type="xs:anyURI"/> - <xs:attribute name="version" type="xs:token"/> - <xs:attribute name="finalDefault" type="xs:fullDerivationSet" use="optional" default=""/> - <xs:attribute name="blockDefault" type="xs:blockSet" use="optional" default=""/> - <xs:attribute name="attributeFormDefault" type="xs:formChoice" use="optional" default="unqualified"/> - <xs:attribute name="elementFormDefault" type="xs:formChoice" use="optional" default="unqualified"/> - <xs:attribute name="id" type="xs:ID"/> - <xs:attribute ref="xml:lang"/> - </xs:extension> - </xs:complexContent> - </xs:complexType> - - <xs:key name="element"> - <xs:selector xpath="xs:element"/> - <xs:field xpath="@name"/> - </xs:key> - - <xs:key name="attribute"> - <xs:selector xpath="xs:attribute"/> - <xs:field xpath="@name"/> - </xs:key> - - <xs:key name="type"> - <xs:selector xpath="xs:complexType|xs:simpleType"/> - <xs:field xpath="@name"/> - </xs:key> - - <xs:key name="group"> - <xs:selector xpath="xs:group"/> - <xs:field xpath="@name"/> - </xs:key> - - <xs:key name="attributeGroup"> - <xs:selector xpath="xs:attributeGroup"/> - <xs:field xpath="@name"/> - </xs:key> - - <xs:key name="notation"> - <xs:selector xpath="xs:notation"/> - <xs:field xpath="@name"/> - </xs:key> - - <xs:key name="identityConstraint"> - <xs:selector xpath=".//xs:key|.//xs:unique|.//xs:keyref"/> - <xs:field xpath="@name"/> - </xs:key> - - </xs:element> - - <xs:simpleType name="allNNI"> - <xs:annotation><xs:documentation> - for maxOccurs</xs:documentation></xs:annotation> - <xs:union memberTypes="xs:nonNegativeInteger"> - <xs:simpleType> - <xs:restriction base="xs:NMTOKEN"> - <xs:enumeration value="unbounded"/> - </xs:restriction> - </xs:simpleType> - </xs:union> - </xs:simpleType> - - <xs:attributeGroup name="occurs"> - <xs:annotation><xs:documentation> - for all particles</xs:documentation></xs:annotation> - <xs:attribute name="minOccurs" type="xs:nonNegativeInteger" use="optional" default="1"/> - <xs:attribute name="maxOccurs" type="xs:allNNI" use="optional" default="1"/> - </xs:attributeGroup> - - <xs:attributeGroup name="defRef"> - <xs:annotation><xs:documentation> + </xs:annotation> + <xs:union> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="#all"/> + </xs:restriction> + </xs:simpleType> + <xs:simpleType> + <xs:list itemType="xs:typeDerivationControl"/> + </xs:simpleType> + </xs:union> + </xs:simpleType> + <xs:element name="schema" id="schema"> + <xs:annotation> + <xs:documentation + source="../structures/structures.html#element-schema"/> + </xs:annotation> + <xs:complexType> + <xs:complexContent> + <xs:extension base="xs:openAttrs"> + <xs:sequence> + <xs:group ref="xs:composition" minOccurs="0" maxOccurs="unbounded"/> + <xs:sequence minOccurs="0"> + <xs:element ref="xs:defaultOpenContent"/> + <xs:element ref="xs:annotation" minOccurs="0" + maxOccurs="unbounded"/> + </xs:sequence> + <xs:sequence minOccurs="0" maxOccurs="unbounded"> + <xs:group ref="xs:schemaTop"/> + <xs:element ref="xs:annotation" minOccurs="0" + maxOccurs="unbounded"/> + </xs:sequence> + </xs:sequence> + <xs:attribute name="targetNamespace" type="xs:anyURI"/> + <xs:attribute name="version" type="xs:token"/> + <xs:attribute name="finalDefault" type="xs:fullDerivationSet" + default="" use="optional"/> + <xs:attribute name="blockDefault" type="xs:blockSet" default="" + use="optional"/> + <xs:attribute name="attributeFormDefault" type="xs:formChoice" + default="unqualified" use="optional"/> + <xs:attribute name="elementFormDefault" type="xs:formChoice" + default="unqualified" use="optional"/> + <xs:attribute name="defaultAttributes" type="xs:QName"/> + <xs:attribute name="xpathDefaultNamespace" type="xs:xpathDefaultNamespace" + default="##local" use="optional"/> + <xs:attribute name="id" type="xs:ID"/> + <xs:attribute ref="xml:lang"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:key name="element"> + <xs:selector xpath="xs:element"/> + <xs:field xpath="@name"/> + </xs:key> + <xs:key name="attribute"> + <xs:selector xpath="xs:attribute"/> + <xs:field xpath="@name"/> + </xs:key> + <xs:key name="type"> + <xs:selector xpath="xs:complexType|xs:simpleType"/> + <xs:field xpath="@name"/> + </xs:key> + <xs:key name="group"> + <xs:selector xpath="xs:group"/> + <xs:field xpath="@name"/> + </xs:key> + <xs:key name="attributeGroup"> + <xs:selector xpath="xs:attributeGroup"/> + <xs:field xpath="@name"/> + </xs:key> + <xs:key name="notation"> + <xs:selector xpath="xs:notation"/> + <xs:field xpath="@name"/> + </xs:key> + <xs:key name="identityConstraint"> + <xs:selector xpath=".//xs:key|.//xs:unique|.//xs:keyref"/> + <xs:field xpath="@name"/> + </xs:key> + </xs:element> + <xs:simpleType name="allNNI"> + <xs:annotation> + <xs:documentation> + for maxOccurs</xs:documentation> + </xs:annotation> + <xs:union memberTypes="xs:nonNegativeInteger"> + <xs:simpleType> + <xs:restriction base="xs:NMTOKEN"> + <xs:enumeration value="unbounded"/> + </xs:restriction> + </xs:simpleType> + </xs:union> + </xs:simpleType> + <xs:attributeGroup name="occurs"> + <xs:annotation> + <xs:documentation> + for all particles</xs:documentation> + </xs:annotation> + <xs:attribute name="minOccurs" type="xs:nonNegativeInteger" default="1" + use="optional"/> + <xs:attribute name="maxOccurs" type="xs:allNNI" default="1" use="optional"/> + </xs:attributeGroup> + <xs:attributeGroup name="defRef"> + <xs:annotation> + <xs:documentation> for element, group and attributeGroup, - which both define and reference</xs:documentation></xs:annotation> - <xs:attribute name="name" type="xs:NCName"/> - <xs:attribute name="ref" type="xs:QName"/> - </xs:attributeGroup> - - <xs:group name="typeDefParticle"> - <xs:annotation> - <xs:documentation> - 'complexType' uses this</xs:documentation></xs:annotation> - <xs:choice> - <xs:element name="group" type="xs:groupRef"/> - <xs:element ref="xs:all"/> - <xs:element ref="xs:choice"/> - <xs:element ref="xs:sequence"/> - </xs:choice> - </xs:group> - - - - <xs:group name="nestedParticle"> - <xs:choice> - <xs:element name="element" type="xs:localElement"/> - <xs:element name="group" type="xs:groupRef"/> - <xs:element ref="xs:choice"/> - <xs:element ref="xs:sequence"/> - <xs:element ref="xs:any"/> - </xs:choice> - </xs:group> - - <xs:group name="particle"> - <xs:choice> - <xs:element name="element" type="xs:localElement"/> - <xs:element name="group" type="xs:groupRef"/> - <xs:element ref="xs:all"/> - <xs:element ref="xs:choice"/> - <xs:element ref="xs:sequence"/> - <xs:element ref="xs:any"/> - </xs:choice> - </xs:group> - - <xs:complexType name="attribute"> - <xs:complexContent> - <xs:extension base="xs:annotated"> + which both define and reference</xs:documentation> + </xs:annotation> + <xs:attribute name="name" type="xs:NCName"/> + <xs:attribute name="ref" type="xs:QName"/> + </xs:attributeGroup> + <xs:group name="typeDefParticle"> + <xs:annotation> + <xs:documentation> + 'complexType' uses this</xs:documentation> + </xs:annotation> + <xs:choice> + <xs:element name="group" type="xs:groupRef"/> + <xs:element ref="xs:all"/> + <xs:element ref="xs:choice"/> + <xs:element ref="xs:sequence"/> + </xs:choice> + </xs:group> + <xs:group name="nestedParticle"> + <xs:choice> + <xs:element name="element" type="xs:localElement"/> + <xs:element name="group" type="xs:groupRef"/> + + <xs:element ref="xs:choice"/> + <xs:element ref="xs:sequence"/> + <xs:element ref="xs:any"/> + </xs:choice> + </xs:group> + <xs:group name="particle"> + <xs:choice> + <xs:element name="element" type="xs:localElement"/> + <xs:element name="group" type="xs:groupRef"/> + <xs:element ref="xs:all"/> + <xs:element ref="xs:choice"/> + <xs:element ref="xs:sequence"/> + <xs:element ref="xs:any"/> + </xs:choice> + </xs:group> + <xs:complexType name="attribute"> + <xs:complexContent> + <xs:extension base="xs:annotated"> + <xs:sequence> + <xs:element name="simpleType" type="xs:localSimpleType" minOccurs="0"/> + </xs:sequence> + <xs:attributeGroup ref="xs:defRef"/> + <xs:attribute name="type" type="xs:QName"/> + <xs:attribute name="use" default="optional" use="optional"> + <xs:simpleType> + <xs:restriction base="xs:NMTOKEN"> + <xs:enumeration value="prohibited"/> + <xs:enumeration value="optional"/> + <xs:enumeration value="required"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + <xs:attribute name="default" type="xs:string"/> + <xs:attribute name="fixed" type="xs:string"/> + <xs:attribute name="form" type="xs:formChoice"/> + <xs:attribute name="targetNamespace" type="xs:anyURI"/> + + <xs:attribute name="inheritable" type="xs:boolean"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="topLevelAttribute"> + <xs:complexContent> + <xs:restriction base="xs:attribute"> + <xs:sequence> + <xs:element ref="xs:annotation" minOccurs="0"/> + <xs:element name="simpleType" type="xs:localSimpleType" minOccurs="0"/> + </xs:sequence> + <xs:attribute name="ref" use="prohibited"/> + <xs:attribute name="form" use="prohibited"/> + <xs:attribute name="use" use="prohibited"/> + <xs:attribute name="targetNamespace" use="prohibited"/> + <xs:attribute name="name" type="xs:NCName" use="required"/> + <xs:attribute name="inheritable" type="xs:boolean"/> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + <xs:group name="attrDecls"> <xs:sequence> - <xs:element name="simpleType" minOccurs="0" type="xs:localSimpleType"/> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element name="attribute" type="xs:attribute"/> + <xs:element name="attributeGroup" type="xs:attributeGroupRef"/> + </xs:choice> + <xs:element ref="xs:anyAttribute" minOccurs="0"/> </xs:sequence> - <xs:attributeGroup ref="xs:defRef"/> - <xs:attribute name="type" type="xs:QName"/> - <xs:attribute name="use" use="optional" default="optional"> - <xs:simpleType> - <xs:restriction base="xs:NMTOKEN"> - <xs:enumeration value="prohibited"/> - <xs:enumeration value="optional"/> - <xs:enumeration value="required"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="default" type="xs:string"/> - <xs:attribute name="fixed" type="xs:string"/> - <xs:attribute name="form" type="xs:formChoice"/> - </xs:extension> - </xs:complexContent> - </xs:complexType> - - <xs:complexType name="topLevelAttribute"> - <xs:complexContent> - <xs:restriction base="xs:attribute"> + </xs:group> + <xs:element name="anyAttribute" id="anyAttribute"> + <xs:annotation> + <xs:documentation + source="../structures/structures.html#element-anyAttribute"/> + </xs:annotation> + <xs:complexType> + <xs:complexContent> + <xs:extension base="xs:wildcard"> + <xs:attribute name="notQName" type="xs:qnameListA" + use="optional"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + <xs:group name="assertions"> <xs:sequence> - <xs:element ref="xs:annotation" minOccurs="0"/> - <xs:element name="simpleType" minOccurs="0" type="xs:localSimpleType"/> + <xs:element name="assert" type="xs:assertion" + minOccurs="0" maxOccurs="unbounded"/> </xs:sequence> - <xs:attribute name="ref" use="prohibited"/> - <xs:attribute name="form" use="prohibited"/> - <xs:attribute name="use" use="prohibited"/> - <xs:attribute name="name" use="required" type="xs:NCName"/> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:restriction> - </xs:complexContent> - </xs:complexType> - - <xs:group name="attrDecls"> - <xs:sequence> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element name="attribute" type="xs:attribute"/> - <xs:element name="attributeGroup" type="xs:attributeGroupRef"/> - </xs:choice> - <xs:element ref="xs:anyAttribute" minOccurs="0"/> - </xs:sequence> - </xs:group> - - <xs:element name="anyAttribute" type="xs:wildcard" id="anyAttribute"> - <xs:annotation> - <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-anyAttribute"/> - </xs:annotation> - </xs:element> - - <xs:group name="complexTypeModel"> - <xs:choice> + </xs:group> + <xs:complexType name="assertion"> + <xs:complexContent> + <xs:extension base="xs:annotated"> + <xs:attribute name="test" type="xs:string"/> + <xs:attribute name="xpathDefaultNamespace" type="xs:xpathDefaultNamespace"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:group name="complexTypeModel"> + <xs:choice> <xs:element ref="xs:simpleContent"/> <xs:element ref="xs:complexContent"/> <xs:sequence> - <xs:annotation> - <xs:documentation> + <xs:annotation> + <xs:documentation> This branch is short for &lt;complexContent> &lt;restriction base="xs:anyType"> ... &lt;/restriction> &lt;/complexContent></xs:documentation> - </xs:annotation> - <xs:group ref="xs:typeDefParticle" minOccurs="0"/> - <xs:group ref="xs:attrDecls"/> + </xs:annotation> + <xs:element ref="xs:openContent" minOccurs="0"/> + <xs:group ref="xs:typeDefParticle" minOccurs="0"/> + <xs:group ref="xs:attrDecls"/> + <xs:group ref="xs:assertions"/> </xs:sequence> - </xs:choice> - </xs:group> - - <xs:complexType name="complexType" abstract="true"> - <xs:complexContent> - <xs:extension base="xs:annotated"> - <xs:group ref="xs:complexTypeModel"/> - <xs:attribute name="name" type="xs:NCName"> - <xs:annotation> - <xs:documentation> - Will be restricted to required or forbidden</xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute name="mixed" type="xs:boolean" use="optional" default="false"> - <xs:annotation> - <xs:documentation> + </xs:choice> + </xs:group> + <xs:complexType name="complexType" abstract="true"> + <xs:complexContent> + <xs:extension base="xs:annotated"> + <xs:group ref="xs:complexTypeModel"/> + <xs:attribute name="name" type="xs:NCName"> + <xs:annotation> + <xs:documentation> + Will be restricted to required or prohibited</xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute name="mixed" type="xs:boolean" use="optional"> + <xs:annotation> + <xs:documentation> Not allowed if simpleContent child is chosen. - May be overriden by setting on complexContent child.</xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute name="abstract" type="xs:boolean" use="optional" default="false"/> - <xs:attribute name="final" type="xs:derivationSet"/> - <xs:attribute name="block" type="xs:derivationSet"/> - </xs:extension> - </xs:complexContent> - </xs:complexType> - - <xs:complexType name="topLevelComplexType"> - <xs:complexContent> - <xs:restriction base="xs:complexType"> - <xs:sequence> - <xs:element ref="xs:annotation" minOccurs="0"/> - <xs:group ref="xs:complexTypeModel"/> - </xs:sequence> - <xs:attribute name="name" type="xs:NCName" use="required"/> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:restriction> - </xs:complexContent> - </xs:complexType> - - <xs:complexType name="localComplexType"> - <xs:complexContent> - <xs:restriction base="xs:complexType"> - <xs:sequence> - <xs:element ref="xs:annotation" minOccurs="0"/> - <xs:group ref="xs:complexTypeModel"/> - </xs:sequence> - <xs:attribute name="name" use="prohibited"/> - <xs:attribute name="abstract" use="prohibited"/> - <xs:attribute name="final" use="prohibited"/> - <xs:attribute name="block" use="prohibited"/> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:restriction> - </xs:complexContent> - </xs:complexType> - - <xs:complexType name="restrictionType"> - <xs:complexContent> - <xs:extension base="xs:annotated"> - <xs:sequence> - <xs:choice minOccurs="0"> - <xs:group ref="xs:typeDefParticle"/> - <xs:group ref="xs:simpleRestrictionModel"/> - </xs:choice> - <xs:group ref="xs:attrDecls"/> - </xs:sequence> - <xs:attribute name="base" type="xs:QName" use="required"/> - </xs:extension> - </xs:complexContent> - </xs:complexType> - - <xs:complexType name="complexRestrictionType"> - <xs:complexContent> - <xs:restriction base="xs:restrictionType"> - <xs:sequence> - <xs:element ref="xs:annotation" minOccurs="0"/> - <xs:choice minOccurs="0"> - <xs:annotation> - <xs:documentation>This choice is added simply to - make this a valid restriction per the REC</xs:documentation> - </xs:annotation> - <xs:group ref="xs:typeDefParticle"/> - </xs:choice> - <xs:group ref="xs:attrDecls"/> - </xs:sequence> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:restriction> - </xs:complexContent> - </xs:complexType> - - <xs:complexType name="extensionType"> - <xs:complexContent> - <xs:extension base="xs:annotated"> - <xs:sequence> - <xs:group ref="xs:typeDefParticle" minOccurs="0"/> - <xs:group ref="xs:attrDecls"/> - </xs:sequence> - <xs:attribute name="base" type="xs:QName" use="required"/> - </xs:extension> - </xs:complexContent> - </xs:complexType> - - <xs:element name="complexContent" id="complexContent"> - <xs:annotation> - <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-complexContent"/> - </xs:annotation> - <xs:complexType> - <xs:complexContent> - <xs:extension base="xs:annotated"> - <xs:choice> - <xs:element name="restriction" type="xs:complexRestrictionType"/> - <xs:element name="extension" type="xs:extensionType"/> - </xs:choice> - <xs:attribute name="mixed" type="xs:boolean"> - <xs:annotation> - <xs:documentation> - Overrides any setting on complexType parent.</xs:documentation> - </xs:annotation> - </xs:attribute> - </xs:extension> - </xs:complexContent> + May be overridden by setting on complexContent child.</xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute name="abstract" type="xs:boolean" default="false" + use="optional"/> + <xs:attribute name="final" type="xs:derivationSet"/> + <xs:attribute name="block" type="xs:derivationSet"/> + <xs:attribute name="defaultAttributesApply" type="xs:boolean" + default="true" use="optional"/> + </xs:extension> + </xs:complexContent> </xs:complexType> - </xs:element> - - <xs:complexType name="simpleRestrictionType"> - <xs:complexContent> - <xs:restriction base="xs:restrictionType"> - <xs:sequence> - <xs:element ref="xs:annotation" minOccurs="0"/> - <xs:choice minOccurs="0"> - <xs:annotation> - <xs:documentation>This choice is added simply to - make this a valid restriction per the REC</xs:documentation> - </xs:annotation> - <xs:group ref="xs:simpleRestrictionModel"/> - </xs:choice> - <xs:group ref="xs:attrDecls"/> - </xs:sequence> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:restriction> - </xs:complexContent> - </xs:complexType> - - <xs:complexType name="simpleExtensionType"> - <xs:complexContent> - <xs:restriction base="xs:extensionType"> - <xs:sequence> - <xs:annotation> - <xs:documentation> + <xs:complexType name="topLevelComplexType"> + <xs:complexContent> + <xs:restriction base="xs:complexType"> + <xs:sequence> + <xs:element ref="xs:annotation" minOccurs="0"/> + <xs:group ref="xs:complexTypeModel"/> + </xs:sequence> + <xs:attribute name="name" type="xs:NCName" use="required"/> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="localComplexType"> + <xs:complexContent> + <xs:restriction base="xs:complexType"> + <xs:sequence> + <xs:element ref="xs:annotation" minOccurs="0"/> + <xs:group ref="xs:complexTypeModel"/> + </xs:sequence> + <xs:attribute name="name" use="prohibited"/> + <xs:attribute name="abstract" use="prohibited"/> + <xs:attribute name="final" use="prohibited"/> + <xs:attribute name="block" use="prohibited"/> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="restrictionType"> + <xs:complexContent> + <xs:extension base="xs:annotated"> + <xs:sequence> + <xs:choice minOccurs="0"> + + <xs:sequence> + <xs:element ref="xs:openContent" minOccurs="0"/> + <xs:group ref="xs:typeDefParticle"/> + </xs:sequence> + <xs:group ref="xs:simpleRestrictionModel"/> + </xs:choice> + <xs:group ref="xs:attrDecls"/> + <xs:group ref="xs:assertions"/> + </xs:sequence> + <xs:attribute name="base" type="xs:QName" use="required"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="complexRestrictionType"> + <xs:complexContent> + <xs:restriction base="xs:restrictionType"> + <xs:sequence> + <xs:element ref="xs:annotation" minOccurs="0"/> + <xs:choice minOccurs="0"> + <xs:annotation> + <xs:documentation>This choice is added simply to + make this a valid restriction per the REC</xs:documentation> + </xs:annotation> + + <xs:sequence> + <xs:element ref="xs:openContent" minOccurs="0"/> + <xs:group ref="xs:typeDefParticle"/> + </xs:sequence> + </xs:choice> + <xs:group ref="xs:attrDecls"/> + <xs:group ref="xs:assertions"/> + </xs:sequence> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="extensionType"> + <xs:complexContent> + <xs:extension base="xs:annotated"> + <xs:sequence> + <xs:element ref="xs:openContent" minOccurs="0"/> + <xs:group ref="xs:typeDefParticle" minOccurs="0"/> + <xs:group ref="xs:attrDecls"/> + <xs:group ref="xs:assertions"/> + </xs:sequence> + <xs:attribute name="base" type="xs:QName" use="required"/> + + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:element name="complexContent" id="complexContent"> + <xs:annotation> + <xs:documentation + source="../structures/structures.html#element-complexContent"/> + </xs:annotation> + <xs:complexType> + <xs:complexContent> + <xs:extension base="xs:annotated"> + <xs:choice> + <xs:element name="restriction" type="xs:complexRestrictionType"/> + <xs:element name="extension" type="xs:extensionType"/> + </xs:choice> + <xs:attribute name="mixed" type="xs:boolean"> + <xs:annotation> + <xs:documentation> + Overrides any setting on complexType parent.</xs:documentation> + </xs:annotation> + </xs:attribute> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + <xs:element name="openContent" id="openContent"> + <xs:annotation> + <xs:documentation + source="../structures/structures.html#element-openContent"/> + </xs:annotation> + <xs:complexType> + <xs:complexContent> + <xs:extension base="xs:annotated"> + <xs:sequence> + <xs:element name="any" minOccurs="0" type="xs:wildcard"/> + </xs:sequence> + <xs:attribute name="mode" default="interleave" use="optional"> + <xs:simpleType> + <xs:restriction base="xs:NMTOKEN"> + <xs:enumeration value="none"/> + <xs:enumeration value="interleave"/> + <xs:enumeration value="suffix"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + <xs:element name="defaultOpenContent" id="defaultOpenContent"> + <xs:annotation> + <xs:documentation + source="../structures/structures.html#element-defaultOpenContent"/> + </xs:annotation> + <xs:complexType> + <xs:complexContent> + <xs:extension base="xs:annotated"> + <xs:sequence> + <xs:element name="any" type="xs:wildcard"/> + </xs:sequence> + <xs:attribute name="appliesToEmpty" type="xs:boolean" + default="false" use="optional"/> + <xs:attribute name="mode" default="interleave" use="optional"> + <xs:simpleType> + <xs:restriction base="xs:NMTOKEN"> + <xs:enumeration value="interleave"/> + <xs:enumeration value="suffix"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + <xs:complexType name="simpleRestrictionType"> + <xs:complexContent> + <xs:restriction base="xs:restrictionType"> + <xs:sequence> + <xs:element ref="xs:annotation" minOccurs="0"/> + <xs:choice minOccurs="0"> + <xs:annotation> + <xs:documentation>This choice is added simply to + make this a valid restriction per the REC</xs:documentation> + </xs:annotation> + <xs:group ref="xs:simpleRestrictionModel"/> + </xs:choice> + <xs:group ref="xs:attrDecls"/> + <xs:group ref="xs:assertions"/> + </xs:sequence> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="simpleExtensionType"> + <xs:complexContent> + <xs:restriction base="xs:extensionType"> + <xs:sequence> + <xs:annotation> + <xs:documentation> No typeDefParticle group reference</xs:documentation> - </xs:annotation> - <xs:element ref="xs:annotation" minOccurs="0"/> - <xs:group ref="xs:attrDecls"/> - </xs:sequence> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:restriction> - </xs:complexContent> - </xs:complexType> - - <xs:element name="simpleContent" id="simpleContent"> - <xs:annotation> - <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-simpleContent"/> - </xs:annotation> - <xs:complexType> - <xs:complexContent> - <xs:extension base="xs:annotated"> - <xs:choice> - <xs:element name="restriction" type="xs:simpleRestrictionType"/> - <xs:element name="extension" type="xs:simpleExtensionType"/> - </xs:choice> - </xs:extension> - </xs:complexContent> + </xs:annotation> + <xs:element ref="xs:annotation" minOccurs="0"/> + <xs:group ref="xs:attrDecls"/> + <xs:group ref="xs:assertions"/> + </xs:sequence> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:restriction> + </xs:complexContent> </xs:complexType> - </xs:element> - - <xs:element name="complexType" type="xs:topLevelComplexType" id="complexType"> - <xs:annotation> - <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-complexType"/> - </xs:annotation> - </xs:element> - - + <xs:element name="simpleContent" id="simpleContent"> + <xs:annotation> + <xs:documentation + source="../structures/structures.html#element-simpleContent"/> + </xs:annotation> + <xs:complexType> + <xs:complexContent> + <xs:extension base="xs:annotated"> + <xs:choice> + <xs:element name="restriction" type="xs:simpleRestrictionType"/> + <xs:element name="extension" type="xs:simpleExtensionType"/> + </xs:choice> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + <xs:element name="complexType" type="xs:topLevelComplexType" id="complexType"> + <xs:annotation> + <xs:documentation + source="../structures/structures.html#element-complexType"/> + </xs:annotation> + </xs:element> <xs:simpleType name="blockSet"> - <xs:annotation> - <xs:documentation> + <xs:annotation> + <xs:documentation> A utility type, not for public use</xs:documentation> - <xs:documentation> + <xs:documentation> #all or (possibly empty) subset of {substitution, extension, restriction}</xs:documentation> - </xs:annotation> - <xs:union> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="#all"/> - </xs:restriction> - </xs:simpleType> - <xs:simpleType> - <xs:list> + </xs:annotation> + <xs:union> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="#all"/> + </xs:restriction> + </xs:simpleType> <xs:simpleType> - <xs:restriction base="xs:derivationControl"> - <xs:enumeration value="extension"/> - <xs:enumeration value="restriction"/> - <xs:enumeration value="substitution"/> - </xs:restriction> + <xs:list> + <xs:simpleType> + <xs:restriction base="xs:derivationControl"> + <xs:enumeration value="extension"/> + <xs:enumeration value="restriction"/> + <xs:enumeration value="substitution"/> + </xs:restriction> + </xs:simpleType> + </xs:list> </xs:simpleType> - </xs:list> - </xs:simpleType> - </xs:union> + </xs:union> </xs:simpleType> - - <xs:complexType name="element" abstract="true"> - <xs:annotation> - <xs:documentation> + <xs:complexType name="element" abstract="true"> + <xs:annotation> + <xs:documentation> The element element can be used either at the top level to define an element-type binding globally, or within a content model to either reference a globally-defined element or type or declare an element-type binding locally. The ref form is not allowed at the top level.</xs:documentation> - </xs:annotation> - - <xs:complexContent> - <xs:extension base="xs:annotated"> - <xs:sequence> - <xs:choice minOccurs="0"> - <xs:element name="simpleType" type="xs:localSimpleType"/> - <xs:element name="complexType" type="xs:localComplexType"/> - </xs:choice> - <xs:group ref="xs:identityConstraint" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - <xs:attributeGroup ref="xs:defRef"/> - <xs:attribute name="type" type="xs:QName"/> - <xs:attribute name="substitutionGroup" type="xs:QName"/> - <xs:attributeGroup ref="xs:occurs"/> - <xs:attribute name="default" type="xs:string"/> - <xs:attribute name="fixed" type="xs:string"/> - <xs:attribute name="nillable" type="xs:boolean" use="optional" default="false"/> - <xs:attribute name="abstract" type="xs:boolean" use="optional" default="false"/> - <xs:attribute name="final" type="xs:derivationSet"/> - <xs:attribute name="block" type="xs:blockSet"/> - <xs:attribute name="form" type="xs:formChoice"/> - </xs:extension> - </xs:complexContent> - </xs:complexType> - - <xs:complexType name="topLevelElement"> - <xs:complexContent> - <xs:restriction base="xs:element"> - <xs:sequence> - <xs:element ref="xs:annotation" minOccurs="0"/> - <xs:choice minOccurs="0"> - <xs:element name="simpleType" type="xs:localSimpleType"/> - <xs:element name="complexType" type="xs:localComplexType"/> - </xs:choice> - <xs:group ref="xs:identityConstraint" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - <xs:attribute name="ref" use="prohibited"/> - <xs:attribute name="form" use="prohibited"/> - <xs:attribute name="minOccurs" use="prohibited"/> - <xs:attribute name="maxOccurs" use="prohibited"/> - <xs:attribute name="name" use="required" type="xs:NCName"/> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:restriction> - </xs:complexContent> - </xs:complexType> - - <xs:complexType name="localElement"> - <xs:complexContent> - <xs:restriction base="xs:element"> - <xs:sequence> - <xs:element ref="xs:annotation" minOccurs="0"/> - <xs:choice minOccurs="0"> - <xs:element name="simpleType" type="xs:localSimpleType"/> - <xs:element name="complexType" type="xs:localComplexType"/> - </xs:choice> - <xs:group ref="xs:identityConstraint" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - <xs:attribute name="substitutionGroup" use="prohibited"/> - <xs:attribute name="final" use="prohibited"/> - <xs:attribute name="abstract" use="prohibited"/> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:restriction> - </xs:complexContent> - </xs:complexType> - - <xs:element name="element" type="xs:topLevelElement" id="element"> - <xs:annotation> - <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-element"/> - </xs:annotation> - </xs:element> - - <xs:complexType name="group" abstract="true"> - <xs:annotation> - <xs:documentation> + </xs:annotation> + <xs:complexContent> + <xs:extension base="xs:annotated"> + <xs:sequence> + <xs:choice minOccurs="0"> + <xs:element name="simpleType" type="xs:localSimpleType"/> + <xs:element name="complexType" type="xs:localComplexType"/> + </xs:choice> + <xs:element name="alternative" type="xs:altType" + minOccurs="0" maxOccurs="unbounded"/> + <xs:group ref="xs:identityConstraint" minOccurs="0" + maxOccurs="unbounded"/> + </xs:sequence> + <xs:attributeGroup ref="xs:defRef"/> + <xs:attribute name="type" type="xs:QName"/> + + <xs:attribute name="substitutionGroup"> + <xs:simpleType> + <xs:list itemType="xs:QName"/> + </xs:simpleType> + </xs:attribute> + <xs:attributeGroup ref="xs:occurs"/> + <xs:attribute name="default" type="xs:string"/> + <xs:attribute name="fixed" type="xs:string"/> + <xs:attribute name="nillable" type="xs:boolean" use="optional"/> + <xs:attribute name="abstract" type="xs:boolean" default="false" + use="optional"/> + <xs:attribute name="final" type="xs:derivationSet"/> + <xs:attribute name="block" type="xs:blockSet"/> + <xs:attribute name="form" type="xs:formChoice"/> + <xs:attribute name="targetNamespace" type="xs:anyURI"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="topLevelElement"> + <xs:complexContent> + <xs:restriction base="xs:element"> + <xs:sequence> + <xs:element ref="xs:annotation" minOccurs="0"/> + <xs:choice minOccurs="0"> + <xs:element name="simpleType" type="xs:localSimpleType"/> + <xs:element name="complexType" type="xs:localComplexType"/> + </xs:choice> + <xs:element name="alternative" type="xs:altType" + minOccurs="0" maxOccurs="unbounded"/> + <xs:group ref="xs:identityConstraint" minOccurs="0" + maxOccurs="unbounded"/> + </xs:sequence> + <xs:attribute name="ref" use="prohibited"/> + <xs:attribute name="form" use="prohibited"/> + <xs:attribute name="targetNamespace" use="prohibited"/> + <xs:attribute name="minOccurs" use="prohibited"/> + <xs:attribute name="maxOccurs" use="prohibited"/> + <xs:attribute name="name" type="xs:NCName" use="required"/> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="localElement"> + <xs:complexContent> + <xs:restriction base="xs:element"> + <xs:sequence> + <xs:element ref="xs:annotation" minOccurs="0"/> + <xs:choice minOccurs="0"> + <xs:element name="simpleType" type="xs:localSimpleType"/> + <xs:element name="complexType" type="xs:localComplexType"/> + </xs:choice> + <xs:element name="alternative" type="xs:altType" + minOccurs="0" maxOccurs="unbounded"/> + <xs:group ref="xs:identityConstraint" minOccurs="0" + maxOccurs="unbounded"/> + </xs:sequence> + <xs:attribute name="substitutionGroup" use="prohibited"/> + <xs:attribute name="final" use="prohibited"/> + <xs:attribute name="abstract" use="prohibited"/> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + <xs:element name="element" type="xs:topLevelElement" id="element"> + <xs:annotation> + <xs:documentation + source="../structures/structures.html#element-element"/> + </xs:annotation> + </xs:element> + <xs:complexType name="altType"> + <xs:annotation> + <xs:documentation> + This type is used for 'alternative' elements. + </xs:documentation> + </xs:annotation> + <xs:complexContent> + <xs:extension base="xs:annotated"> + <xs:choice minOccurs="0"> + <xs:element name="simpleType" type="xs:localSimpleType"/> + <xs:element name="complexType" type="xs:localComplexType"/> + </xs:choice> + <xs:attribute name="test" type="xs:string" use="optional"/> + <xs:attribute name="type" type="xs:QName" use="optional"/> + <xs:attribute name="xpathDefaultNamespace" type="xs:xpathDefaultNamespace"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="group" abstract="true"> + <xs:annotation> + <xs:documentation> group type for explicit groups, named top-level groups and group references</xs:documentation> - </xs:annotation> - <xs:complexContent> - <xs:extension base="xs:annotated"> - <xs:group ref="xs:particle" minOccurs="0" maxOccurs="unbounded"/> - <xs:attributeGroup ref="xs:defRef"/> - <xs:attributeGroup ref="xs:occurs"/> - </xs:extension> - </xs:complexContent> - </xs:complexType> - - <xs:complexType name="realGroup"> - <xs:complexContent> - <xs:restriction base="xs:group"> - <xs:sequence> - <xs:element ref="xs:annotation" minOccurs="0"/> - <xs:choice minOccurs="0" maxOccurs="1"> - <xs:element ref="xs:all"/> - <xs:element ref="xs:choice"/> - <xs:element ref="xs:sequence"/> - </xs:choice> - </xs:sequence> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:restriction> - </xs:complexContent> - </xs:complexType> - - <xs:complexType name="namedGroup"> - <xs:complexContent> - <xs:restriction base="xs:realGroup"> - <xs:sequence> - <xs:element ref="xs:annotation" minOccurs="0"/> - <xs:choice minOccurs="1" maxOccurs="1"> - <xs:element name="all"> - <xs:complexType> - <xs:complexContent> - <xs:restriction base="xs:all"> - <xs:group ref="xs:allModel"/> - <xs:attribute name="minOccurs" use="prohibited"/> - <xs:attribute name="maxOccurs" use="prohibited"/> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:restriction> - </xs:complexContent> - </xs:complexType> - </xs:element> - <xs:element name="choice" type="xs:simpleExplicitGroup"/> - <xs:element name="sequence" type="xs:simpleExplicitGroup"/> - </xs:choice> - </xs:sequence> - <xs:attribute name="name" use="required" type="xs:NCName"/> - <xs:attribute name="ref" use="prohibited"/> - <xs:attribute name="minOccurs" use="prohibited"/> - <xs:attribute name="maxOccurs" use="prohibited"/> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:restriction> - </xs:complexContent> - </xs:complexType> - - <xs:complexType name="groupRef"> - <xs:complexContent> - <xs:restriction base="xs:realGroup"> - <xs:sequence> - <xs:element ref="xs:annotation" minOccurs="0"/> - </xs:sequence> - <xs:attribute name="ref" use="required" type="xs:QName"/> - <xs:attribute name="name" use="prohibited"/> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:restriction> - </xs:complexContent> - </xs:complexType> - - <xs:complexType name="explicitGroup"> - <xs:annotation> - <xs:documentation> - group type for the three kinds of group</xs:documentation> - </xs:annotation> - <xs:complexContent> - <xs:restriction base="xs:group"> - <xs:sequence> - <xs:element ref="xs:annotation" minOccurs="0"/> - <xs:group ref="xs:nestedParticle" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - <xs:attribute name="name" type="xs:NCName" use="prohibited"/> - <xs:attribute name="ref" type="xs:QName" use="prohibited"/> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:restriction> - </xs:complexContent> - </xs:complexType> - - <xs:complexType name="simpleExplicitGroup"> - <xs:complexContent> - <xs:restriction base="xs:explicitGroup"> - <xs:sequence> - <xs:element ref="xs:annotation" minOccurs="0"/> - <xs:group ref="xs:nestedParticle" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - <xs:attribute name="minOccurs" use="prohibited"/> - <xs:attribute name="maxOccurs" use="prohibited"/> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:restriction> - </xs:complexContent> - </xs:complexType> - - <xs:group name="allModel"> - <xs:sequence> - <xs:element ref="xs:annotation" minOccurs="0"/> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:annotation> - <xs:documentation>This choice with min/max is here to - avoid a pblm with the Elt:All/Choice/Seq - Particle derivation constraint</xs:documentation> - </xs:annotation> - <xs:element name="element" type="xs:narrowMaxMin"/> - </xs:choice> - </xs:sequence> - </xs:group> - - - <xs:complexType name="narrowMaxMin"> - <xs:annotation> - <xs:documentation>restricted max/min</xs:documentation> - </xs:annotation> - <xs:complexContent> - <xs:restriction base="xs:localElement"> - <xs:sequence> - <xs:element ref="xs:annotation" minOccurs="0"/> - <xs:choice minOccurs="0"> - <xs:element name="simpleType" type="xs:localSimpleType"/> - <xs:element name="complexType" type="xs:localComplexType"/> - </xs:choice> - <xs:group ref="xs:identityConstraint" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - <xs:attribute name="minOccurs" use="optional" default="1"> - <xs:simpleType> - <xs:restriction base="xs:nonNegativeInteger"> - <xs:enumeration value="0"/> - <xs:enumeration value="1"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="maxOccurs" use="optional" default="1"> - <xs:simpleType> - <xs:restriction base="xs:allNNI"> - <xs:enumeration value="0"/> - <xs:enumeration value="1"/> + </xs:annotation> + <xs:complexContent> + <xs:extension base="xs:annotated"> + + <xs:group ref="xs:particle" minOccurs="0" maxOccurs="unbounded"/> + + <xs:attributeGroup ref="xs:defRef"/> + <xs:attributeGroup ref="xs:occurs"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="realGroup"> + <xs:complexContent> + <xs:restriction base="xs:group"> + <xs:sequence> + <xs:element ref="xs:annotation" minOccurs="0"/> + <xs:choice minOccurs="0" maxOccurs="1"> + <xs:element ref="xs:all"/> + <xs:element ref="xs:choice"/> + <xs:element ref="xs:sequence"/> + </xs:choice> + + </xs:sequence> + <xs:anyAttribute namespace="##other" processContents="lax"/> </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:restriction> - </xs:complexContent> - </xs:complexType> - - <xs:complexType name="all"> - <xs:annotation> - <xs:documentation> - Only elements allowed inside</xs:documentation> - </xs:annotation> - <xs:complexContent> - <xs:restriction base="xs:explicitGroup"> - <xs:group ref="xs:allModel"/> - <xs:attribute name="minOccurs" use="optional" default="1"> - <xs:simpleType> - <xs:restriction base="xs:nonNegativeInteger"> - <xs:enumeration value="0"/> - <xs:enumeration value="1"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="maxOccurs" use="optional" default="1"> - <xs:simpleType> - <xs:restriction base="xs:allNNI"> - <xs:enumeration value="1"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:restriction> - </xs:complexContent> + </xs:complexContent> </xs:complexType> - - <xs:element name="all" id="all" type="xs:all"> - <xs:annotation> - <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-all"/> - </xs:annotation> - </xs:element> - - <xs:element name="choice" type="xs:explicitGroup" id="choice"> - <xs:annotation> - <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-choice"/> - </xs:annotation> - </xs:element> - - <xs:element name="sequence" type="xs:explicitGroup" id="sequence"> - <xs:annotation> - <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-sequence"/> - </xs:annotation> - </xs:element> - - <xs:element name="group" type="xs:namedGroup" id="group"> - <xs:annotation> - <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-group"/> - </xs:annotation> - </xs:element> - - <xs:complexType name="wildcard"> - <xs:complexContent> - <xs:extension base="xs:annotated"> - <xs:attribute name="namespace" type="xs:namespaceList" use="optional" default="##any"/> - <xs:attribute name="processContents" use="optional" default="strict"> - <xs:simpleType> - <xs:restriction base="xs:NMTOKEN"> - <xs:enumeration value="skip"/> - <xs:enumeration value="lax"/> - <xs:enumeration value="strict"/> + <xs:complexType name="namedGroup"> + <xs:complexContent> + <xs:restriction base="xs:realGroup"> + <xs:sequence> + <xs:element ref="xs:annotation" minOccurs="0"/> + <xs:choice minOccurs="1" maxOccurs="1"> + <xs:element name="all"> + <xs:complexType> + <xs:complexContent> + <xs:restriction base="xs:all"> + <xs:group ref="xs:allModel"/> + <xs:attribute name="minOccurs" use="prohibited"/> + <xs:attribute name="maxOccurs" use="prohibited"/> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + </xs:element> + <xs:element name="choice" type="xs:simpleExplicitGroup"/> + <xs:element name="sequence" type="xs:simpleExplicitGroup"/> + </xs:choice> + </xs:sequence> + <xs:attribute name="name" type="xs:NCName" use="required"/> + <xs:attribute name="ref" use="prohibited"/> + <xs:attribute name="minOccurs" use="prohibited"/> + <xs:attribute name="maxOccurs" use="prohibited"/> + <xs:anyAttribute namespace="##other" processContents="lax"/> </xs:restriction> - </xs:simpleType> - </xs:attribute> - </xs:extension> - </xs:complexContent> - </xs:complexType> - - <xs:element name="any" id="any"> - <xs:annotation> - <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-any"/> - </xs:annotation> - <xs:complexType> - <xs:complexContent> - <xs:extension base="xs:wildcard"> - <xs:attributeGroup ref="xs:occurs"/> - </xs:extension> - </xs:complexContent> + </xs:complexContent> </xs:complexType> - </xs:element> - - <xs:annotation> - <xs:documentation> - simple type for the value of the 'namespace' attr of - 'any' and 'anyAttribute'</xs:documentation> - </xs:annotation> - <xs:annotation> - <xs:documentation> - Value is - ##any - - any non-conflicting WFXML/attribute at all - - ##other - - any non-conflicting WFXML/attribute from - namespace other than targetNS - - ##local - - any unqualified non-conflicting WFXML/attribute - - one or - - any non-conflicting WFXML/attribute from - more URI the listed namespaces - references - (space separated) - - ##targetNamespace or ##local may appear in the above list, to - refer to the targetNamespace of the enclosing - schema or an absent targetNamespace respectively</xs:documentation> - </xs:annotation> - - <xs:simpleType name="namespaceList"> - <xs:annotation> - <xs:documentation> - A utility type, not for public use</xs:documentation> - </xs:annotation> - <xs:union> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="##any"/> - <xs:enumeration value="##other"/> - </xs:restriction> - </xs:simpleType> - <xs:simpleType> - <xs:list> - <xs:simpleType> - <xs:union memberTypes="xs:anyURI"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="##targetNamespace"/> - <xs:enumeration value="##local"/> - </xs:restriction> - </xs:simpleType> - </xs:union> - </xs:simpleType> - </xs:list> - </xs:simpleType> - </xs:union> - </xs:simpleType> - - <xs:element name="attribute" type="xs:topLevelAttribute" id="attribute"> - <xs:annotation> - <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-attribute"/> - </xs:annotation> - </xs:element> - - <xs:complexType name="attributeGroup" abstract="true"> - <xs:complexContent> - <xs:extension base="xs:annotated"> - <xs:group ref="xs:attrDecls"/> - <xs:attributeGroup ref="xs:defRef"/> - </xs:extension> - </xs:complexContent> - </xs:complexType> - - <xs:complexType name="namedAttributeGroup"> - <xs:complexContent> - <xs:restriction base="xs:attributeGroup"> - <xs:sequence> - <xs:element ref="xs:annotation" minOccurs="0"/> - <xs:group ref="xs:attrDecls"/> - </xs:sequence> - <xs:attribute name="name" use="required" type="xs:NCName"/> - <xs:attribute name="ref" use="prohibited"/> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:restriction> - </xs:complexContent> - </xs:complexType> - - <xs:complexType name="attributeGroupRef"> - <xs:complexContent> - <xs:restriction base="xs:attributeGroup"> - <xs:sequence> - <xs:element ref="xs:annotation" minOccurs="0"/> - </xs:sequence> - <xs:attribute name="ref" use="required" type="xs:QName"/> - <xs:attribute name="name" use="prohibited"/> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:restriction> - </xs:complexContent> - </xs:complexType> - - <xs:element name="attributeGroup" type="xs:namedAttributeGroup" id="attributeGroup"> - <xs:annotation> - <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-attributeGroup"/> - </xs:annotation> - </xs:element> - - <xs:element name="include" id="include"> - <xs:annotation> - <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-include"/> - </xs:annotation> - <xs:complexType> - <xs:complexContent> - <xs:extension base="xs:annotated"> - <xs:attribute name="schemaLocation" type="xs:anyURI" use="required"/> - </xs:extension> - </xs:complexContent> + <xs:complexType name="groupRef"> + <xs:complexContent> + <xs:restriction base="xs:realGroup"> + <xs:sequence> + <xs:element ref="xs:annotation" minOccurs="0"/> + </xs:sequence> + <xs:attribute name="ref" type="xs:QName" use="required"/> + <xs:attribute name="name" use="prohibited"/> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:restriction> + </xs:complexContent> </xs:complexType> - </xs:element> - - <xs:element name="redefine" id="redefine"> - <xs:annotation> - <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-redefine"/> - </xs:annotation> - <xs:complexType> - <xs:complexContent> - <xs:extension base="xs:openAttrs"> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="xs:annotation"/> - <xs:group ref="xs:redefinable"/> - </xs:choice> - <xs:attribute name="schemaLocation" type="xs:anyURI" use="required"/> - <xs:attribute name="id" type="xs:ID"/> - </xs:extension> - </xs:complexContent> + <xs:complexType name="explicitGroup"> + <xs:annotation> + <xs:documentation> + group type for the three kinds of group</xs:documentation> + </xs:annotation> + <xs:complexContent> + <xs:restriction base="xs:group"> + <xs:sequence> + <xs:element ref="xs:annotation" minOccurs="0"/> + <xs:group ref="xs:nestedParticle" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + <xs:attribute name="name" use="prohibited"/> + <xs:attribute name="ref" use="prohibited"/> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:restriction> + </xs:complexContent> </xs:complexType> - </xs:element> - - <xs:element name="import" id="import"> - <xs:annotation> - <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-import"/> - </xs:annotation> - <xs:complexType> - <xs:complexContent> - <xs:extension base="xs:annotated"> - <xs:attribute name="namespace" type="xs:anyURI"/> - <xs:attribute name="schemaLocation" type="xs:anyURI"/> - </xs:extension> - </xs:complexContent> + <xs:complexType name="simpleExplicitGroup"> + <xs:complexContent> + <xs:restriction base="xs:explicitGroup"> + <xs:sequence> + <xs:element ref="xs:annotation" minOccurs="0"/> + <xs:group ref="xs:nestedParticle" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + <xs:attribute name="minOccurs" use="prohibited"/> + <xs:attribute name="maxOccurs" use="prohibited"/> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:restriction> + </xs:complexContent> </xs:complexType> - </xs:element> - - <xs:element name="selector" id="selector"> - <xs:annotation> - <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-selector"/> - </xs:annotation> - <xs:complexType> - <xs:complexContent> - <xs:extension base="xs:annotated"> - <xs:attribute name="xpath" use="required"> - <xs:simpleType> - <xs:annotation> - <xs:documentation>A subset of XPath expressions for use -in selectors</xs:documentation> - <xs:documentation>A utility type, not for public -use</xs:documentation> - </xs:annotation> - <xs:restriction base="xs:token"> - <xs:annotation> - <xs:documentation>The following pattern is intended to allow XPath - expressions per the following EBNF: - Selector ::= Path ( '|' Path )* - Path ::= ('.//')? Step ( '/' Step )* - Step ::= '.' | NameTest - NameTest ::= QName | '*' | NCName ':' '*' - child:: is also allowed - </xs:documentation> - </xs:annotation> - <xs:pattern value="(\.//)?(((child::)?((\i\c*:)?(\i\c*|\*)))|\.)(/(((child::)?((\i\c*:)?(\i\c*|\*)))|\.))*(\|(\.//)?(((child::)?((\i\c*:)?(\i\c*|\*)))|\.)(/(((child::)?((\i\c*:)?(\i\c*|\*)))|\.))*)*"> - </xs:pattern> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - </xs:extension> - </xs:complexContent> - </xs:complexType> - </xs:element> - - <xs:element name="field" id="field"> - <xs:annotation> - <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-field"/> - </xs:annotation> - <xs:complexType> - <xs:complexContent> - <xs:extension base="xs:annotated"> - <xs:attribute name="xpath" use="required"> - <xs:simpleType> - <xs:annotation> - <xs:documentation>A subset of XPath expressions for use -in fields</xs:documentation> - <xs:documentation>A utility type, not for public -use</xs:documentation> - </xs:annotation> - <xs:restriction base="xs:token"> + <xs:group name="allModel"> + <xs:sequence> + <xs:element ref="xs:annotation" minOccurs="0"/> + <xs:choice minOccurs="0" maxOccurs="unbounded"> <xs:annotation> - <xs:documentation>The following pattern is intended to allow XPath - expressions per the same EBNF as for selector, - with the following change: - Path ::= ('.//')? ( Step '/' )* ( Step | '@' NameTest ) - </xs:documentation> + <xs:documentation>This choice with min/max is here to + avoid a pblm with the Elt:All/Choice/Seq + Particle derivation constraint</xs:documentation> </xs:annotation> - <xs:pattern value="(\.//)?((((child::)?((\i\c*:)?(\i\c*|\*)))|\.)/)*((((child::)?((\i\c*:)?(\i\c*|\*)))|\.)|((attribute::|@)((\i\c*:)?(\i\c*|\*))))(\|(\.//)?((((child::)?((\i\c*:)?(\i\c*|\*)))|\.)/)*((((child::)?((\i\c*:)?(\i\c*|\*)))|\.)|((attribute::|@)((\i\c*:)?(\i\c*|\*)))))*"> - </xs:pattern> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - </xs:extension> - </xs:complexContent> - </xs:complexType> - </xs:element> - - <xs:complexType name="keybase"> - <xs:complexContent> - <xs:extension base="xs:annotated"> - <xs:sequence> - <xs:element ref="xs:selector"/> - <xs:element ref="xs:field" minOccurs="1" maxOccurs="unbounded"/> - </xs:sequence> - <xs:attribute name="name" type="xs:NCName" use="required"/> - </xs:extension> - </xs:complexContent> - </xs:complexType> - - <xs:group name="identityConstraint"> - <xs:annotation> - <xs:documentation>The three kinds of identity constraints, all with - type of or derived from 'keybase'. - </xs:documentation> - </xs:annotation> - <xs:choice> - <xs:element ref="xs:unique"/> - <xs:element ref="xs:key"/> - <xs:element ref="xs:keyref"/> - </xs:choice> - </xs:group> - - <xs:element name="unique" type="xs:keybase" id="unique"> - <xs:annotation> - <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-unique"/> - </xs:annotation> - </xs:element> - <xs:element name="key" type="xs:keybase" id="key"> - <xs:annotation> - <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-key"/> - </xs:annotation> - </xs:element> - <xs:element name="keyref" id="keyref"> - <xs:annotation> - <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-keyref"/> - </xs:annotation> - <xs:complexType> - <xs:complexContent> - <xs:extension base="xs:keybase"> - <xs:attribute name="refer" type="xs:QName" use="required"/> - </xs:extension> - </xs:complexContent> - </xs:complexType> - </xs:element> - - <xs:element name="notation" id="notation"> - <xs:annotation> - <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-notation"/> - </xs:annotation> - <xs:complexType> - <xs:complexContent> - <xs:extension base="xs:annotated"> - <xs:attribute name="name" type="xs:NCName" use="required"/> - <xs:attribute name="public" type="xs:public"/> - <xs:attribute name="system" type="xs:anyURI"/> - </xs:extension> - </xs:complexContent> - </xs:complexType> - </xs:element> - - <xs:simpleType name="public"> - <xs:annotation> - <xs:documentation> - A utility type, not for public use</xs:documentation> - <xs:documentation> - A public identifier, per ISO 8879</xs:documentation> - </xs:annotation> - <xs:restriction base="xs:token"/> - </xs:simpleType> - - <xs:element name="appinfo" id="appinfo"> - <xs:annotation> - <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-appinfo"/> - </xs:annotation> - <xs:complexType mixed="true"> - <xs:sequence minOccurs="0" maxOccurs="unbounded"> - <xs:any processContents="lax"/> - </xs:sequence> - <xs:attribute name="source" type="xs:anyURI"/> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:complexType> - </xs:element> - - <xs:element name="documentation" id="documentation"> - <xs:annotation> - <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-documentation"/> - </xs:annotation> - <xs:complexType mixed="true"> - <xs:sequence minOccurs="0" maxOccurs="unbounded"> - <xs:any processContents="lax"/> + <xs:element name="element" type="xs:localElement"/> + <xs:element ref="xs:any"/> + <xs:element name="group"> + <xs:complexType> + <xs:complexContent> + <xs:restriction base="xs:groupRef"> + <xs:sequence> + <xs:element ref="xs:annotation" minOccurs="0"/> + </xs:sequence> + <xs:attribute name="minOccurs" fixed="1" type="xs:nonNegativeInteger"/> + <xs:attribute name="maxOccurs" fixed="1" type="xs:nonNegativeInteger"/> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + </xs:element> + </xs:choice> </xs:sequence> - <xs:attribute name="source" type="xs:anyURI"/> - <xs:attribute ref="xml:lang"/> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:complexType> - </xs:element> - - <xs:element name="annotation" id="annotation"> - <xs:annotation> - <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-annotation"/> - </xs:annotation> - <xs:complexType> + </xs:group> + <xs:complexType name="all"> + <xs:annotation> + <xs:documentation> + Only elements allowed inside</xs:documentation> + </xs:annotation> <xs:complexContent> - <xs:extension base="xs:openAttrs"> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="xs:appinfo"/> - <xs:element ref="xs:documentation"/> - </xs:choice> - <xs:attribute name="id" type="xs:ID"/> - </xs:extension> + <xs:restriction base="xs:explicitGroup"> + <xs:group ref="xs:allModel"/> + <xs:attribute name="minOccurs" default="1" use="optional"> + <xs:simpleType> + <xs:restriction base="xs:nonNegativeInteger"> + <xs:enumeration value="0"/> + <xs:enumeration value="1"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + <xs:attribute name="maxOccurs" default="1" use="optional"> + <xs:simpleType> + <xs:restriction base="xs:allNNI"> + <xs:enumeration value="0"/> + <xs:enumeration value="1"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:restriction> </xs:complexContent> - </xs:complexType> - </xs:element> - - <xs:annotation> - <xs:documentation> - notations for use within XML Schema schemas</xs:documentation> - </xs:annotation> - - <xs:notation name="XMLSchemaStructures" public="structures" system="http://www.w3.org/2000/08/XMLSchema.xsd"/> - <xs:notation name="XML" public="REC-xml-19980210" system="http://www.w3.org/TR/1998/REC-xml-19980210"/> - - <xs:complexType name="anyType" mixed="true"> - <xs:annotation> - <xs:documentation> - Not the real urType, but as close an approximation as we can - get in the XML representation</xs:documentation> - </xs:annotation> - <xs:sequence> - <xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax"/> - </xs:sequence> - <xs:anyAttribute processContents="lax"/> - </xs:complexType> - - <xs:annotation> - <xs:documentation> - First the built-in primitive datatypes. These definitions are for - information only, the real built-in definitions are magic. - </xs:documentation> - - <xs:documentation> - For each built-in datatype in this schema (both primitive and - derived) can be uniquely addressed via a URI constructed - as follows: - 1) the base URI is the URI of the XML Schema namespace - 2) the fragment identifier is the name of the datatype - - For example, to address the int datatype, the URI is: - - http://www.w3.org/2001/XMLSchema#int - - Additionally, each facet definition element can be uniquely - addressed via a URI constructed as follows: - 1) the base URI is the URI of the XML Schema namespace - 2) the fragment identifier is the name of the facet - - For example, to address the maxInclusive facet, the URI is: - - http://www.w3.org/2001/XMLSchema#maxInclusive - - Additionally, each facet usage in a built-in datatype definition - can be uniquely addressed via a URI constructed as follows: - 1) the base URI is the URI of the XML Schema namespace - 2) the fragment identifier is the name of the datatype, followed - by a period (".") followed by the name of the facet - - For example, to address the usage of the maxInclusive facet in - the definition of int, the URI is: - - http://www.w3.org/2001/XMLSchema#int.maxInclusive - - </xs:documentation> - </xs:annotation> - - <xs:simpleType name="string" id="string"> - <xs:annotation> - <xs:appinfo> - <hfp:hasFacet name="length"/> - <hfp:hasFacet name="minLength"/> - <hfp:hasFacet name="maxLength"/> - <hfp:hasFacet name="pattern"/> - <hfp:hasFacet name="enumeration"/> - <hfp:hasFacet name="whiteSpace"/> - <hfp:hasProperty name="ordered" value="false"/> - <hfp:hasProperty name="bounded" value="false"/> - <hfp:hasProperty name="cardinality" value="countably infinite"/> - <hfp:hasProperty name="numeric" value="false"/> - </xs:appinfo> - <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#string"/> - </xs:annotation> - <xs:restriction base="xs:anySimpleType"> - <xs:whiteSpace value="preserve" id="string.preserve"/> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="boolean" id="boolean"> - <xs:annotation> - <xs:appinfo> - <hfp:hasFacet name="pattern"/> - <hfp:hasFacet name="whiteSpace"/> - <hfp:hasProperty name="ordered" value="false"/> - <hfp:hasProperty name="bounded" value="false"/> - <hfp:hasProperty name="cardinality" value="finite"/> - <hfp:hasProperty name="numeric" value="false"/> - </xs:appinfo> - <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#boolean"/> - </xs:annotation> - <xs:restriction base="xs:anySimpleType"> - <xs:whiteSpace value="collapse" fixed="true" - id="boolean.whiteSpace"/> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="float" id="float"> - <xs:annotation> - <xs:appinfo> - <hfp:hasFacet name="pattern"/> - <hfp:hasFacet name="enumeration"/> - <hfp:hasFacet name="whiteSpace"/> - <hfp:hasFacet name="maxInclusive"/> - <hfp:hasFacet name="maxExclusive"/> - <hfp:hasFacet name="minInclusive"/> - <hfp:hasFacet name="minExclusive"/> - <hfp:hasProperty name="ordered" value="total"/> - <hfp:hasProperty name="bounded" value="true"/> - <hfp:hasProperty name="cardinality" value="finite"/> - <hfp:hasProperty name="numeric" value="true"/> - </xs:appinfo> - <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#float"/> + </xs:complexType> + <xs:element name="all" type="xs:all" id="all"> + <xs:annotation> + <xs:documentation source="../structures/structures.html#element-all"/> </xs:annotation> - <xs:restriction base="xs:anySimpleType"> - <xs:whiteSpace value="collapse" fixed="true" - id="float.whiteSpace"/> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="double" id="double"> - <xs:annotation> - <xs:appinfo> - <hfp:hasFacet name="pattern"/> - <hfp:hasFacet name="enumeration"/> - <hfp:hasFacet name="whiteSpace"/> - <hfp:hasFacet name="maxInclusive"/> - <hfp:hasFacet name="maxExclusive"/> - <hfp:hasFacet name="minInclusive"/> - <hfp:hasFacet name="minExclusive"/> - <hfp:hasProperty name="ordered" value="total"/> - <hfp:hasProperty name="bounded" value="true"/> - <hfp:hasProperty name="cardinality" value="finite"/> - <hfp:hasProperty name="numeric" value="true"/> - </xs:appinfo> + </xs:element> + <xs:element name="choice" type="xs:explicitGroup" id="choice"> + <xs:annotation> <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#double"/> + source="../structures/structures.html#element-choice"/> </xs:annotation> - <xs:restriction base="xs:anySimpleType"> - <xs:whiteSpace value="collapse" fixed="true" - id="double.whiteSpace"/> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="decimal" id="decimal"> - <xs:annotation> - <xs:appinfo> - <hfp:hasFacet name="totalDigits"/> - <hfp:hasFacet name="fractionDigits"/> - <hfp:hasFacet name="pattern"/> - <hfp:hasFacet name="whiteSpace"/> - <hfp:hasFacet name="enumeration"/> - <hfp:hasFacet name="maxInclusive"/> - <hfp:hasFacet name="maxExclusive"/> - <hfp:hasFacet name="minInclusive"/> - <hfp:hasFacet name="minExclusive"/> - <hfp:hasProperty name="ordered" value="total"/> - <hfp:hasProperty name="bounded" value="false"/> - <hfp:hasProperty name="cardinality" - value="countably infinite"/> - <hfp:hasProperty name="numeric" value="true"/> - </xs:appinfo> + </xs:element> + <xs:element name="sequence" type="xs:explicitGroup" id="sequence"> + <xs:annotation> <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#decimal"/> + source="../structures/structures.html#element-sequence"/> </xs:annotation> - <xs:restriction base="xs:anySimpleType"> - <xs:whiteSpace value="collapse" fixed="true" - id="decimal.whiteSpace"/> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="duration" id="duration"> - <xs:annotation> - <xs:appinfo> - <hfp:hasFacet name="pattern"/> - <hfp:hasFacet name="enumeration"/> - <hfp:hasFacet name="whiteSpace"/> - <hfp:hasFacet name="maxInclusive"/> - <hfp:hasFacet name="maxExclusive"/> - <hfp:hasFacet name="minInclusive"/> - <hfp:hasFacet name="minExclusive"/> - <hfp:hasProperty name="ordered" value="partial"/> - <hfp:hasProperty name="bounded" value="false"/> - <hfp:hasProperty name="cardinality" - value="countably infinite"/> - <hfp:hasProperty name="numeric" value="false"/> - </xs:appinfo> - <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#duration"/> + </xs:element> + <xs:element name="group" type="xs:namedGroup" id="group"> + <xs:annotation> + <xs:documentation source="../structures/structures.html#element-group"/> </xs:annotation> - <xs:restriction base="xs:anySimpleType"> - <xs:whiteSpace value="collapse" fixed="true" - id="duration.whiteSpace"/> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="dateTime" id="dateTime"> - <xs:annotation> - <xs:appinfo> - <hfp:hasFacet name="pattern"/> - <hfp:hasFacet name="enumeration"/> - <hfp:hasFacet name="whiteSpace"/> - <hfp:hasFacet name="maxInclusive"/> - <hfp:hasFacet name="maxExclusive"/> - <hfp:hasFacet name="minInclusive"/> - <hfp:hasFacet name="minExclusive"/> - <hfp:hasProperty name="ordered" value="partial"/> - <hfp:hasProperty name="bounded" value="false"/> - <hfp:hasProperty name="cardinality" - value="countably infinite"/> - <hfp:hasProperty name="numeric" value="false"/> - </xs:appinfo> - <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#dateTime"/> + </xs:element> + <xs:attributeGroup name="anyAttrGroup"> + <xs:attribute name="namespace" type="xs:namespaceList" + use="optional"/> + <xs:attribute name="notNamespace" use="optional"> + <xs:simpleType> + <xs:restriction base="xs:basicNamespaceList"> + <xs:minLength value="1"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + <xs:attribute name="processContents" default="strict" use="optional"> + <xs:simpleType> + <xs:restriction base="xs:NMTOKEN"> + <xs:enumeration value="skip"/> + <xs:enumeration value="lax"/> + <xs:enumeration value="strict"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + </xs:attributeGroup> + <xs:complexType name="wildcard"> + <xs:complexContent> + <xs:extension base="xs:annotated"> + + <xs:attributeGroup ref="xs:anyAttrGroup"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:element name="any" id="any"> + <xs:annotation> + <xs:documentation source="../structures/structures.html#element-any"/> </xs:annotation> - <xs:restriction base="xs:anySimpleType"> - <xs:whiteSpace value="collapse" fixed="true" - id="dateTime.whiteSpace"/> - </xs:restriction> - </xs:simpleType> + <xs:complexType> + <xs:complexContent> + <xs:extension base="xs:wildcard"> + <xs:attribute name="notQName" type="xs:qnameList" + use="optional"/> + <xs:attributeGroup ref="xs:occurs"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + <xs:annotation> + <xs:documentation> + simple type for the value of the 'namespace' attr of + 'any' and 'anyAttribute'</xs:documentation> + </xs:annotation> + <xs:annotation> + <xs:documentation> + Value is + ##any - - any non-conflicting WFXML/attribute at all - <xs:simpleType name="time" id="time"> - <xs:annotation> - <xs:appinfo> - <hfp:hasFacet name="pattern"/> - <hfp:hasFacet name="enumeration"/> - <hfp:hasFacet name="whiteSpace"/> - <hfp:hasFacet name="maxInclusive"/> - <hfp:hasFacet name="maxExclusive"/> - <hfp:hasFacet name="minInclusive"/> - <hfp:hasFacet name="minExclusive"/> - <hfp:hasProperty name="ordered" value="partial"/> - <hfp:hasProperty name="bounded" value="false"/> - <hfp:hasProperty name="cardinality" - value="countably infinite"/> - <hfp:hasProperty name="numeric" value="false"/> - </xs:appinfo> - <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#time"/> - </xs:annotation> - <xs:restriction base="xs:anySimpleType"> - <xs:whiteSpace value="collapse" fixed="true" - id="time.whiteSpace"/> - </xs:restriction> - </xs:simpleType> + ##other - - any non-conflicting WFXML/attribute from + namespace other than targetNS - <xs:simpleType name="date" id="date"> - <xs:annotation> - <xs:appinfo> - <hfp:hasFacet name="pattern"/> - <hfp:hasFacet name="enumeration"/> - <hfp:hasFacet name="whiteSpace"/> - <hfp:hasFacet name="maxInclusive"/> - <hfp:hasFacet name="maxExclusive"/> - <hfp:hasFacet name="minInclusive"/> - <hfp:hasFacet name="minExclusive"/> - <hfp:hasProperty name="ordered" value="partial"/> - <hfp:hasProperty name="bounded" value="false"/> - <hfp:hasProperty name="cardinality" - value="countably infinite"/> - <hfp:hasProperty name="numeric" value="false"/> - </xs:appinfo> - <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#date"/> - </xs:annotation> - <xs:restriction base="xs:anySimpleType"> - <xs:whiteSpace value="collapse" fixed="true" - id="date.whiteSpace"/> - </xs:restriction> - </xs:simpleType> + ##local - - any unqualified non-conflicting WFXML/attribute - <xs:simpleType name="gYearMonth" id="gYearMonth"> - <xs:annotation> - <xs:appinfo> - <hfp:hasFacet name="pattern"/> - <hfp:hasFacet name="enumeration"/> - <hfp:hasFacet name="whiteSpace"/> - <hfp:hasFacet name="maxInclusive"/> - <hfp:hasFacet name="maxExclusive"/> - <hfp:hasFacet name="minInclusive"/> - <hfp:hasFacet name="minExclusive"/> - <hfp:hasProperty name="ordered" value="partial"/> - <hfp:hasProperty name="bounded" value="false"/> - <hfp:hasProperty name="cardinality" - value="countably infinite"/> - <hfp:hasProperty name="numeric" value="false"/> - </xs:appinfo> - <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#gYearMonth"/> - </xs:annotation> - <xs:restriction base="xs:anySimpleType"> - <xs:whiteSpace value="collapse" fixed="true" - id="gYearMonth.whiteSpace"/> - </xs:restriction> - </xs:simpleType> + one or - - any non-conflicting WFXML/attribute from + more URI the listed namespaces + references + (space separated) - <xs:simpleType name="gYear" id="gYear"> - <xs:annotation> - <xs:appinfo> - <hfp:hasFacet name="pattern"/> - <hfp:hasFacet name="enumeration"/> - <hfp:hasFacet name="whiteSpace"/> - <hfp:hasFacet name="maxInclusive"/> - <hfp:hasFacet name="maxExclusive"/> - <hfp:hasFacet name="minInclusive"/> - <hfp:hasFacet name="minExclusive"/> - <hfp:hasProperty name="ordered" value="partial"/> - <hfp:hasProperty name="bounded" value="false"/> - <hfp:hasProperty name="cardinality" - value="countably infinite"/> - <hfp:hasProperty name="numeric" value="false"/> - </xs:appinfo> - <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#gYear"/> + ##targetNamespace or ##local may appear in the above list, to + refer to the targetNamespace of the enclosing + schema or an absent targetNamespace respectively</xs:documentation> + </xs:annotation> + <xs:simpleType name="namespaceList"> + <xs:annotation> + <xs:documentation> + A utility type, not for public use</xs:documentation> </xs:annotation> - <xs:restriction base="xs:anySimpleType"> - <xs:whiteSpace value="collapse" fixed="true" - id="gYear.whiteSpace"/> - </xs:restriction> + + <xs:union memberTypes="xs:specialNamespaceList xs:basicNamespaceList" /> </xs:simpleType> - - <xs:simpleType name="gMonthDay" id="gMonthDay"> - <xs:annotation> - <xs:appinfo> - <hfp:hasFacet name="pattern"/> - <hfp:hasFacet name="enumeration"/> - <hfp:hasFacet name="whiteSpace"/> - <hfp:hasFacet name="maxInclusive"/> - <hfp:hasFacet name="maxExclusive"/> - <hfp:hasFacet name="minInclusive"/> - <hfp:hasFacet name="minExclusive"/> - <hfp:hasProperty name="ordered" value="partial"/> - <hfp:hasProperty name="bounded" value="false"/> - <hfp:hasProperty name="cardinality" - value="countably infinite"/> - <hfp:hasProperty name="numeric" value="false"/> - </xs:appinfo> - <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#gMonthDay"/> - </xs:annotation> - <xs:restriction base="xs:anySimpleType"> - <xs:whiteSpace value="collapse" fixed="true" - id="gMonthDay.whiteSpace"/> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="gDay" id="gDay"> - <xs:annotation> - <xs:appinfo> - <hfp:hasFacet name="pattern"/> - <hfp:hasFacet name="enumeration"/> - <hfp:hasFacet name="whiteSpace"/> - <hfp:hasFacet name="maxInclusive"/> - <hfp:hasFacet name="maxExclusive"/> - <hfp:hasFacet name="minInclusive"/> - <hfp:hasFacet name="minExclusive"/> - <hfp:hasProperty name="ordered" value="partial"/> - <hfp:hasProperty name="bounded" value="false"/> - <hfp:hasProperty name="cardinality" - value="countably infinite"/> - <hfp:hasProperty name="numeric" value="false"/> - </xs:appinfo> - <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#gDay"/> + <xs:simpleType name="basicNamespaceList"> + <xs:annotation> + <xs:documentation> + A utility type, not for public use</xs:documentation> </xs:annotation> - <xs:restriction base="xs:anySimpleType"> - <xs:whiteSpace value="collapse" fixed="true" - id="gDay.whiteSpace"/> - </xs:restriction> + <xs:list> + <xs:simpleType> + <xs:union memberTypes="xs:anyURI"> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="##targetNamespace"/> + <xs:enumeration value="##local"/> + </xs:restriction> + </xs:simpleType> + </xs:union> + </xs:simpleType> + </xs:list> </xs:simpleType> - - <xs:simpleType name="gMonth" id="gMonth"> - <xs:annotation> - <xs:appinfo> - <hfp:hasFacet name="pattern"/> - <hfp:hasFacet name="enumeration"/> - <hfp:hasFacet name="whiteSpace"/> - <hfp:hasFacet name="maxInclusive"/> - <hfp:hasFacet name="maxExclusive"/> - <hfp:hasFacet name="minInclusive"/> - <hfp:hasFacet name="minExclusive"/> - <hfp:hasProperty name="ordered" value="partial"/> - <hfp:hasProperty name="bounded" value="false"/> - <hfp:hasProperty name="cardinality" - value="countably infinite"/> - <hfp:hasProperty name="numeric" value="false"/> - </xs:appinfo> - <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#gMonth"/> + <xs:simpleType name="specialNamespaceList"> + <xs:annotation> + <xs:documentation> + A utility type, not for public use</xs:documentation> </xs:annotation> - <xs:restriction base="xs:anySimpleType"> - <xs:whiteSpace value="collapse" fixed="true" - id="gMonth.whiteSpace"/> + <xs:restriction base="xs:token"> + <xs:enumeration value="##any"/> + <xs:enumeration value="##other"/> </xs:restriction> </xs:simpleType> - - <xs:simpleType name="hexBinary" id="hexBinary"> - <xs:annotation> - <xs:appinfo> - <hfp:hasFacet name="length"/> - <hfp:hasFacet name="minLength"/> - <hfp:hasFacet name="maxLength"/> - <hfp:hasFacet name="pattern"/> - <hfp:hasFacet name="enumeration"/> - <hfp:hasFacet name="whiteSpace"/> - <hfp:hasProperty name="ordered" value="false"/> - <hfp:hasProperty name="bounded" value="false"/> - <hfp:hasProperty name="cardinality" - value="countably infinite"/> - <hfp:hasProperty name="numeric" value="false"/> - </xs:appinfo> - <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#binary"/> - </xs:annotation> - <xs:restriction base="xs:anySimpleType"> - <xs:whiteSpace value="collapse" fixed="true" - id="hexBinary.whiteSpace"/> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="base64Binary" id="base64Binary"> - <xs:annotation> - <xs:appinfo> - <hfp:hasFacet name="length"/> - <hfp:hasFacet name="minLength"/> - <hfp:hasFacet name="maxLength"/> - <hfp:hasFacet name="pattern"/> - <hfp:hasFacet name="enumeration"/> - <hfp:hasFacet name="whiteSpace"/> - <hfp:hasProperty name="ordered" value="false"/> - <hfp:hasProperty name="bounded" value="false"/> - <hfp:hasProperty name="cardinality" - value="countably infinite"/> - <hfp:hasProperty name="numeric" value="false"/> - </xs:appinfo> - <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#base64Binary"/> - </xs:annotation> - <xs:restriction base="xs:anySimpleType"> - <xs:whiteSpace value="collapse" fixed="true" - id="base64Binary.whiteSpace"/> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="anyURI" id="anyURI"> - <xs:annotation> - <xs:appinfo> - <hfp:hasFacet name="length"/> - <hfp:hasFacet name="minLength"/> - <hfp:hasFacet name="maxLength"/> - <hfp:hasFacet name="pattern"/> - <hfp:hasFacet name="enumeration"/> - <hfp:hasFacet name="whiteSpace"/> - <hfp:hasProperty name="ordered" value="false"/> - <hfp:hasProperty name="bounded" value="false"/> - <hfp:hasProperty name="cardinality" - value="countably infinite"/> - <hfp:hasProperty name="numeric" value="false"/> - </xs:appinfo> - <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#anyURI"/> - </xs:annotation> - <xs:restriction base="xs:anySimpleType"> - <xs:whiteSpace value="collapse" fixed="true" - id="anyURI.whiteSpace"/> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="QName" id="QName"> - <xs:annotation> - <xs:appinfo> - <hfp:hasFacet name="length"/> - <hfp:hasFacet name="minLength"/> - <hfp:hasFacet name="maxLength"/> - <hfp:hasFacet name="pattern"/> - <hfp:hasFacet name="enumeration"/> - <hfp:hasFacet name="whiteSpace"/> - <hfp:hasProperty name="ordered" value="false"/> - <hfp:hasProperty name="bounded" value="false"/> - <hfp:hasProperty name="cardinality" - value="countably infinite"/> - <hfp:hasProperty name="numeric" value="false"/> - </xs:appinfo> - <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#QName"/> + <xs:simpleType name="qnameList"> + <xs:annotation> + <xs:documentation> + A utility type, not for public use + </xs:documentation> </xs:annotation> - <xs:restriction base="xs:anySimpleType"> - <xs:whiteSpace value="collapse" fixed="true" - id="QName.whiteSpace"/> - </xs:restriction> + <xs:list> + <xs:simpleType> + <xs:union memberTypes="xs:QName"> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="##defined"/> + <xs:enumeration value="##definedSibling"/> + </xs:restriction> + </xs:simpleType> + </xs:union> + </xs:simpleType> + </xs:list> </xs:simpleType> - - <xs:simpleType name="NOTATION" id="NOTATION"> - <xs:annotation> - <xs:appinfo> - <hfp:hasFacet name="length"/> - <hfp:hasFacet name="minLength"/> - <hfp:hasFacet name="maxLength"/> - <hfp:hasFacet name="pattern"/> - <hfp:hasFacet name="enumeration"/> - <hfp:hasFacet name="whiteSpace"/> - <hfp:hasProperty name="ordered" value="false"/> - <hfp:hasProperty name="bounded" value="false"/> - <hfp:hasProperty name="cardinality" - value="countably infinite"/> - <hfp:hasProperty name="numeric" value="false"/> - </xs:appinfo> - <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#NOTATION"/> + <xs:simpleType name="qnameListA"> + <xs:annotation> <xs:documentation> - NOTATION cannot be used directly in a schema; rather a type - must be derived from it by specifying at least one enumeration - facet whose value is the name of a NOTATION declared in the - schema. + A utility type, not for public use </xs:documentation> </xs:annotation> - <xs:restriction base="xs:anySimpleType"> - <xs:whiteSpace value="collapse" fixed="true" - id="NOTATION.whiteSpace"/> - </xs:restriction> + <xs:list> + <xs:simpleType> + <xs:union memberTypes="xs:QName"> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="##defined"/> + </xs:restriction> + </xs:simpleType> + </xs:union> + </xs:simpleType> + </xs:list> </xs:simpleType> - - <xs:annotation> - <xs:documentation> - Now the derived primitive types - </xs:documentation> - </xs:annotation> - - <xs:simpleType name="normalizedString" id="normalizedString"> + <xs:simpleType name="xpathDefaultNamespace"> + <xs:union memberTypes="xs:anyURI"> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="##defaultNamespace"/> + <xs:enumeration value="##targetNamespace"/> + <xs:enumeration value="##local"/> + </xs:restriction> + </xs:simpleType> + </xs:union> + </xs:simpleType> + <xs:element name="attribute" type="xs:topLevelAttribute" id="attribute"> <xs:annotation> <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#normalizedString"/> + source="../structures/structures.html#element-attribute"/> </xs:annotation> - <xs:restriction base="xs:string"> - <xs:whiteSpace value="replace" - id="normalizedString.whiteSpace"/> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="token" id="token"> + </xs:element> + <xs:complexType name="attributeGroup" abstract="true"> + <xs:complexContent> + <xs:extension base="xs:annotated"> + + <xs:group ref="xs:attrDecls"/> + + <xs:attributeGroup ref="xs:defRef"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="namedAttributeGroup"> + <xs:complexContent> + <xs:restriction base="xs:attributeGroup"> + <xs:sequence> + <xs:element ref="xs:annotation" minOccurs="0"/> + <xs:group ref="xs:attrDecls"/> + + </xs:sequence> + <xs:attribute name="name" type="xs:NCName" use="required"/> + <xs:attribute name="ref" use="prohibited"/> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="attributeGroupRef"> + <xs:complexContent> + <xs:restriction base="xs:attributeGroup"> + <xs:sequence> + <xs:element ref="xs:annotation" minOccurs="0"/> + </xs:sequence> + <xs:attribute name="ref" type="xs:QName" use="required"/> + <xs:attribute name="name" use="prohibited"/> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + <xs:element name="attributeGroup" type="xs:namedAttributeGroup" + id="attributeGroup"> <xs:annotation> <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#token"/> + source="../structures/structures.html#element-attributeGroup"/> </xs:annotation> - <xs:restriction base="xs:normalizedString"> - <xs:whiteSpace value="collapse" id="token.whiteSpace"/> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="language" id="language"> + </xs:element> + <xs:element name="include" id="include"> <xs:annotation> <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#language"/> + source="../structures/structures.html#element-include"/> </xs:annotation> - <xs:restriction base="xs:token"> - <xs:pattern - value="[a-zA-Z]{1,8}(-[a-zA-Z0-9]{1,8})*" - id="language.pattern"> - <xs:annotation> - <xs:documentation - source="http://www.ietf.org/rfc/rfc3066.txt"> - pattern specifies the content of section 2.12 of XML 1.0e2 - and RFC 3066 (Revised version of RFC 1766). - </xs:documentation> - </xs:annotation> - </xs:pattern> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="IDREFS" id="IDREFS"> - <xs:annotation> - <xs:appinfo> - <hfp:hasFacet name="length"/> - <hfp:hasFacet name="minLength"/> - <hfp:hasFacet name="maxLength"/> - <hfp:hasFacet name="enumeration"/> - <hfp:hasFacet name="whiteSpace"/> - <hfp:hasFacet name="pattern"/> - <hfp:hasProperty name="ordered" value="false"/> - <hfp:hasProperty name="bounded" value="false"/> - <hfp:hasProperty name="cardinality" - value="countably infinite"/> - <hfp:hasProperty name="numeric" value="false"/> - </xs:appinfo> + <xs:complexType> + <xs:complexContent> + <xs:extension base="xs:annotated"> + <xs:attribute name="schemaLocation" type="xs:anyURI" use="required"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + <xs:element name="redefine" id="redefine"> + <xs:annotation> <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#IDREFS"/> + source="../structures/structures.html#element-redefine"/> </xs:annotation> - <xs:restriction> - <xs:simpleType> - <xs:list itemType="xs:IDREF"/> - </xs:simpleType> - <xs:minLength value="1" id="IDREFS.minLength"/> - </xs:restriction> - </xs:simpleType> + <xs:complexType> + <xs:complexContent> + <xs:extension base="xs:openAttrs"> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element ref="xs:annotation"/> + <xs:group ref="xs:redefinable"/> + </xs:choice> + <xs:attribute name="schemaLocation" type="xs:anyURI" use="required"/> + <xs:attribute name="id" type="xs:ID"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> - <xs:simpleType name="ENTITIES" id="ENTITIES"> - <xs:annotation> - <xs:appinfo> - <hfp:hasFacet name="length"/> - <hfp:hasFacet name="minLength"/> - <hfp:hasFacet name="maxLength"/> - <hfp:hasFacet name="enumeration"/> - <hfp:hasFacet name="whiteSpace"/> - <hfp:hasFacet name="pattern"/> - <hfp:hasProperty name="ordered" value="false"/> - <hfp:hasProperty name="bounded" value="false"/> - <hfp:hasProperty name="cardinality" - value="countably infinite"/> - <hfp:hasProperty name="numeric" value="false"/> - </xs:appinfo> + <xs:element name="override" id="override"> + <xs:annotation> <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#ENTITIES"/> + source="../structures/structures.html#element-override"/> </xs:annotation> - <xs:restriction> - <xs:simpleType> - <xs:list itemType="xs:ENTITY"/> - </xs:simpleType> - <xs:minLength value="1" id="ENTITIES.minLength"/> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="NMTOKEN" id="NMTOKEN"> + <xs:complexType> + <xs:complexContent> + <xs:extension base="xs:openAttrs"> + <xs:sequence> + <xs:element ref="xs:annotation" minOccurs="0"/> + <xs:group ref="xs:schemaTop" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + <xs:attribute name="schemaLocation" type="xs:anyURI" use="required"/> + <xs:attribute name="id" type="xs:ID"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + <xs:element name="import" id="import"> <xs:annotation> <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#NMTOKEN"/> + source="../structures/structures.html#element-import"/> </xs:annotation> - <xs:restriction base="xs:token"> - <xs:pattern value="\c+" id="NMTOKEN.pattern"> - <xs:annotation> - <xs:documentation - source="http://www.w3.org/TR/REC-xml#NT-Nmtoken"> - pattern matches production 7 from the XML spec - </xs:documentation> - </xs:annotation> - </xs:pattern> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="NMTOKENS" id="NMTOKENS"> - <xs:annotation> - <xs:appinfo> - <hfp:hasFacet name="length"/> - <hfp:hasFacet name="minLength"/> - <hfp:hasFacet name="maxLength"/> - <hfp:hasFacet name="enumeration"/> - <hfp:hasFacet name="whiteSpace"/> - <hfp:hasFacet name="pattern"/> - <hfp:hasProperty name="ordered" value="false"/> - <hfp:hasProperty name="bounded" value="false"/> - <hfp:hasProperty name="cardinality" - value="countably infinite"/> - <hfp:hasProperty name="numeric" value="false"/> - </xs:appinfo> + <xs:complexType> + <xs:complexContent> + <xs:extension base="xs:annotated"> + <xs:attribute name="namespace" type="xs:anyURI"/> + <xs:attribute name="schemaLocation" type="xs:anyURI"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + <xs:element name="selector" id="selector"> + <xs:annotation> <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#NMTOKENS"/> + source="../structures/structures.html#element-selector"/> </xs:annotation> - <xs:restriction> - <xs:simpleType> - <xs:list itemType="xs:NMTOKEN"/> - </xs:simpleType> - <xs:minLength value="1" id="NMTOKENS.minLength"/> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="Name" id="Name"> + <xs:complexType> + <xs:complexContent> + <xs:extension base="xs:annotated"> + <xs:attribute name="xpath" use="required"> + <xs:simpleType> + <xs:annotation> + <xs:documentation>A subset of XPath expressions for use +in selectors</xs:documentation> + <xs:documentation>A utility type, not for public +use</xs:documentation> + </xs:annotation> + <xs:restriction base="xs:token"/> + + </xs:simpleType> + </xs:attribute> + <xs:attribute name="xpathDefaultNamespace" type="xs:xpathDefaultNamespace"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + <xs:element name="field" id="field"> + <xs:annotation> + <xs:documentation source="../structures/structures.html#element-field"/> + </xs:annotation> + <xs:complexType> + <xs:complexContent> + <xs:extension base="xs:annotated"> + <xs:attribute name="xpath" use="required"> + <xs:simpleType> + <xs:annotation> + <xs:documentation>A subset of XPath expressions for use +in fields</xs:documentation> + <xs:documentation>A utility type, not for public +use</xs:documentation> + </xs:annotation> + <xs:restriction base="xs:token"/> + + </xs:simpleType> + </xs:attribute> + <xs:attribute name="xpathDefaultNamespace" type="xs:xpathDefaultNamespace"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + <xs:complexType name="keybase"> + <xs:complexContent> + <xs:extension base="xs:annotated"> + <xs:sequence minOccurs="0"> + <xs:element ref="xs:selector"/> + <xs:element ref="xs:field" minOccurs="1" maxOccurs="unbounded"/> + </xs:sequence> + <xs:attribute name="name" type="xs:NCName"/> + <xs:attribute name="ref" type="xs:QName"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:group name="identityConstraint"> <xs:annotation> - <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#Name"/> + <xs:documentation>The three kinds of identity constraints, all with + type of or derived from 'keybase'. + </xs:documentation> </xs:annotation> - <xs:restriction base="xs:token"> - <xs:pattern value="\i\c*" id="Name.pattern"> - <xs:annotation> - <xs:documentation - source="http://www.w3.org/TR/REC-xml#NT-Name"> - pattern matches production 5 from the XML spec - </xs:documentation> - </xs:annotation> - </xs:pattern> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="NCName" id="NCName"> + <xs:choice> + <xs:element ref="xs:unique"/> + <xs:element ref="xs:key"/> + <xs:element ref="xs:keyref"/> + </xs:choice> + </xs:group> + <xs:element name="unique" type="xs:keybase" id="unique"> <xs:annotation> <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#NCName"/> + source="../structures/structures.html#element-unique"/> </xs:annotation> - <xs:restriction base="xs:Name"> - <xs:pattern value="[\i-[:]][\c-[:]]*" id="NCName.pattern"> - <xs:annotation> - <xs:documentation - source="http://www.w3.org/TR/REC-xml-names/#NT-NCName"> - pattern matches production 4 from the Namespaces in XML spec - </xs:documentation> - </xs:annotation> - </xs:pattern> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="ID" id="ID"> + </xs:element> + <xs:element name="key" type="xs:keybase" id="key"> <xs:annotation> - <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#ID"/> + <xs:documentation source="../structures/structures.html#element-key"/> </xs:annotation> - <xs:restriction base="xs:NCName"/> - </xs:simpleType> - - <xs:simpleType name="IDREF" id="IDREF"> + </xs:element> + <xs:element name="keyref" id="keyref"> <xs:annotation> <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#IDREF"/> + source="../structures/structures.html#element-keyref"/> </xs:annotation> - <xs:restriction base="xs:NCName"/> - </xs:simpleType> - - <xs:simpleType name="ENTITY" id="ENTITY"> + <xs:complexType> + <xs:complexContent> + <xs:extension base="xs:keybase"> + <xs:attribute name="refer" type="xs:QName"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + <xs:element name="notation" id="notation"> <xs:annotation> <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#ENTITY"/> + source="../structures/structures.html#element-notation"/> </xs:annotation> - <xs:restriction base="xs:NCName"/> - </xs:simpleType> - - <xs:simpleType name="integer" id="integer"> + <xs:complexType> + <xs:complexContent> + <xs:extension base="xs:annotated"> + <xs:attribute name="name" type="xs:NCName" use="required"/> + <xs:attribute name="public" type="xs:public"/> + <xs:attribute name="system" type="xs:anyURI"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + <xs:simpleType name="public"> <xs:annotation> - <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#integer"/> + <xs:documentation> + A utility type, not for public use</xs:documentation> + <xs:documentation> + A public identifier, per ISO 8879</xs:documentation> </xs:annotation> - <xs:restriction base="xs:decimal"> - <xs:fractionDigits value="0" fixed="true" id="integer.fractionDigits"/> - <xs:pattern value="[\-+]?[0-9]+"/> - </xs:restriction> + <xs:restriction base="xs:token"/> </xs:simpleType> - - <xs:simpleType name="nonPositiveInteger" id="nonPositiveInteger"> + <xs:element name="appinfo" id="appinfo"> <xs:annotation> <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#nonPositiveInteger"/> + source="../structures/structures.html#element-appinfo"/> </xs:annotation> - <xs:restriction base="xs:integer"> - <xs:maxInclusive value="0" id="nonPositiveInteger.maxInclusive"/> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="negativeInteger" id="negativeInteger"> + <xs:complexType mixed="true"> + <xs:sequence minOccurs="0" maxOccurs="unbounded"> + <xs:any processContents="lax"/> + </xs:sequence> + <xs:attribute name="source" type="xs:anyURI"/> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:complexType> + </xs:element> + <xs:element name="documentation" id="documentation"> <xs:annotation> <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#negativeInteger"/> + source="../structures/structures.html#element-documentation"/> </xs:annotation> - <xs:restriction base="xs:nonPositiveInteger"> - <xs:maxInclusive value="-1" id="negativeInteger.maxInclusive"/> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="long" id="long"> + <xs:complexType mixed="true"> + <xs:sequence minOccurs="0" maxOccurs="unbounded"> + <xs:any processContents="lax"/> + </xs:sequence> + <xs:attribute name="source" type="xs:anyURI"/> + <xs:attribute ref="xml:lang"/> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:complexType> + </xs:element> + <xs:element name="annotation" id="annotation"> <xs:annotation> - <xs:appinfo> - <hfp:hasProperty name="bounded" value="true"/> - <hfp:hasProperty name="cardinality" value="finite"/> - </xs:appinfo> <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#long"/> + source="../structures/structures.html#element-annotation"/> </xs:annotation> - <xs:restriction base="xs:integer"> - <xs:minInclusive value="-9223372036854775808" id="long.minInclusive"/> - <xs:maxInclusive value="9223372036854775807" id="long.maxInclusive"/> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="int" id="int"> + <xs:complexType> + <xs:complexContent> + <xs:extension base="xs:openAttrs"> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element ref="xs:appinfo"/> + <xs:element ref="xs:documentation"/> + </xs:choice> + <xs:attribute name="id" type="xs:ID"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + <xs:annotation> + <xs:documentation> + notations for use within schema documents</xs:documentation> + </xs:annotation> + <xs:notation name="XMLSchemaStructures" public="structures" + system="http://www.w3.org/2000/08/XMLSchema.xsd"/> + <xs:notation name="XML" public="REC-xml-19980210" + system="http://www.w3.org/TR/1998/REC-xml-19980210"/> + <xs:complexType name="anyType" mixed="true"> <xs:annotation> - <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#int"/> + <xs:documentation> + Not the real urType, but as close an approximation as we can + get in the XML representation</xs:documentation> </xs:annotation> - <xs:restriction base="xs:long"> - <xs:minInclusive value="-2147483648" id="int.minInclusive"/> - <xs:maxInclusive value="2147483647" id="int.maxInclusive"/> - </xs:restriction> - </xs:simpleType> + <xs:sequence> + <xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax"/> + </xs:sequence> + <xs:anyAttribute processContents="lax"/> + </xs:complexType> - <xs:simpleType name="short" id="short"> - <xs:annotation> - <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#short"/> - </xs:annotation> - <xs:restriction base="xs:int"> - <xs:minInclusive value="-32768" id="short.minInclusive"/> - <xs:maxInclusive value="32767" id="short.maxInclusive"/> - </xs:restriction> - </xs:simpleType> + <xs:annotation> + <xs:documentation> + In keeping with the XML Schema WG's standard versioning policy, + the material in this schema document will persist at the URI + http://www.w3.org/2012/04/XMLSchema.xsd. - <xs:simpleType name="byte" id="byte"> - <xs:annotation> - <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#byte"/> - </xs:annotation> - <xs:restriction base="xs:short"> - <xs:minInclusive value="-128" id="byte.minInclusive"/> - <xs:maxInclusive value="127" id="byte.maxInclusive"/> - </xs:restriction> - </xs:simpleType> + At the date of issue it can also be found at the URI + http://www.w3.org/2009/XMLSchema/XMLSchema.xsd. - <xs:simpleType name="nonNegativeInteger" id="nonNegativeInteger"> - <xs:annotation> - <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#nonNegativeInteger"/> - </xs:annotation> - <xs:restriction base="xs:integer"> - <xs:minInclusive value="0" id="nonNegativeInteger.minInclusive"/> - </xs:restriction> - </xs:simpleType> + The schema document at that URI may however change in the future, + in order to remain compatible with the latest version of XSD + and its namespace. In other words, if XSD or the XML Schema + namespace change, the version of this document at + http://www.w3.org/2009/XMLSchema/XMLSchema.xsd will change accordingly; + the version at http://www.w3.org/2012/04/XMLSchema.xsd will not change. - <xs:simpleType name="unsignedLong" id="unsignedLong"> - <xs:annotation> - <xs:appinfo> - <hfp:hasProperty name="bounded" value="true"/> - <hfp:hasProperty name="cardinality" value="finite"/> - </xs:appinfo> - <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#unsignedLong"/> - </xs:annotation> - <xs:restriction base="xs:nonNegativeInteger"> - <xs:maxInclusive value="18446744073709551615" - id="unsignedLong.maxInclusive"/> - </xs:restriction> - </xs:simpleType> + Previous dated (and unchanging) versions of this schema document + include: - <xs:simpleType name="unsignedInt" id="unsignedInt"> - <xs:annotation> - <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#unsignedInt"/> - </xs:annotation> - <xs:restriction base="xs:unsignedLong"> - <xs:maxInclusive value="4294967295" - id="unsignedInt.maxInclusive"/> - </xs:restriction> - </xs:simpleType> + http://www.w3.org/2012/01/XMLSchema.xsd + (XSD 1.1 Proposed Recommendation) - <xs:simpleType name="unsignedShort" id="unsignedShort"> - <xs:annotation> - <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#unsignedShort"/> - </xs:annotation> - <xs:restriction base="xs:unsignedInt"> - <xs:maxInclusive value="65535" - id="unsignedShort.maxInclusive"/> - </xs:restriction> - </xs:simpleType> + http://www.w3.org/2011/07/XMLSchema.xsd + (XSD 1.1 Candidate Recommendation) - <xs:simpleType name="unsignedByte" id="unsignedByte"> - <xs:annotation> - <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#unsignedByte"/> - </xs:annotation> - <xs:restriction base="xs:unsignedShort"> - <xs:maxInclusive value="255" id="unsignedByte.maxInclusive"/> - </xs:restriction> - </xs:simpleType> + http://www.w3.org/2009/04/XMLSchema.xsd + (XSD 1.1 Candidate Recommendation) - <xs:simpleType name="positiveInteger" id="positiveInteger"> - <xs:annotation> - <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#positiveInteger"/> - </xs:annotation> - <xs:restriction base="xs:nonNegativeInteger"> - <xs:minInclusive value="1" id="positiveInteger.minInclusive"/> - </xs:restriction> - </xs:simpleType> + http://www.w3.org/2004/10/XMLSchema.xsd + (XSD 1.0 Recommendation, Second Edition) - <xs:simpleType name="derivationControl"> - <xs:annotation> - <xs:documentation> - A utility type, not for public use</xs:documentation> + http://www.w3.org/2001/05/XMLSchema.xsd + (XSD 1.0 Recommendation, First Edition) + + + </xs:documentation> </xs:annotation> - <xs:restriction base="xs:NMTOKEN"> - <xs:enumeration value="substitution"/> - <xs:enumeration value="extension"/> - <xs:enumeration value="restriction"/> - <xs:enumeration value="list"/> - <xs:enumeration value="union"/> - </xs:restriction> - </xs:simpleType> - <xs:group name="simpleDerivation"> - <xs:choice> - <xs:element ref="xs:restriction"/> - <xs:element ref="xs:list"/> - <xs:element ref="xs:union"/> - </xs:choice> - </xs:group> - <xs:simpleType name="simpleDerivationSet"> - <xs:annotation> - <xs:documentation> - #all or (possibly empty) subset of {restriction, union, list} - </xs:documentation> - <xs:documentation> + + + <xs:simpleType name="derivationControl"> + <xs:annotation> + <xs:documentation> A utility type, not for public use</xs:documentation> - </xs:annotation> - <xs:union> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="#all"/> + </xs:annotation> + <xs:restriction base="xs:NMTOKEN"> + <xs:enumeration value="substitution"/> + <xs:enumeration value="extension"/> + <xs:enumeration value="restriction"/> + <xs:enumeration value="list"/> + <xs:enumeration value="union"/> </xs:restriction> - </xs:simpleType> - <xs:simpleType> - <xs:list> - <xs:simpleType> - <xs:restriction base="xs:derivationControl"> - <xs:enumeration value="list"/> - <xs:enumeration value="union"/> - <xs:enumeration value="restriction"/> - </xs:restriction> - </xs:simpleType> - </xs:list> - </xs:simpleType> - </xs:union> - </xs:simpleType> - + </xs:simpleType> + <xs:group name="simpleDerivation"> + <xs:choice> + <xs:element ref="xs:restriction"/> + <xs:element ref="xs:list"/> + <xs:element ref="xs:union"/> + </xs:choice> + </xs:group> + <xs:simpleType name="simpleDerivationSet"> + <xs:annotation> + <xs:documentation> + #all or (possibly empty) subset of {restriction, extension, union, list} + </xs:documentation> + <xs:documentation> + A utility type, not for public use</xs:documentation> + </xs:annotation> + <xs:union> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="#all"/> + </xs:restriction> + </xs:simpleType> + <xs:simpleType> + <xs:list> + <xs:simpleType> + <xs:restriction base="xs:derivationControl"> + <xs:enumeration value="list"/> + <xs:enumeration value="union"/> + <xs:enumeration value="restriction"/> + <xs:enumeration value="extension"/> + </xs:restriction> + </xs:simpleType> + </xs:list> + </xs:simpleType> + </xs:union> + </xs:simpleType> <xs:complexType name="simpleType" abstract="true"> <xs:complexContent> <xs:extension base="xs:annotated"> @@ -2173,7 +1615,6 @@ use</xs:documentation> </xs:extension> </xs:complexContent> </xs:complexType> - <xs:complexType name="topLevelSimpleType"> <xs:complexContent> <xs:restriction base="xs:simpleType"> @@ -2181,19 +1622,17 @@ use</xs:documentation> <xs:element ref="xs:annotation" minOccurs="0"/> <xs:group ref="xs:simpleDerivation"/> </xs:sequence> - <xs:attribute name="name" use="required" - type="xs:NCName"> + <xs:attribute name="name" type="xs:NCName" use="required"> <xs:annotation> <xs:documentation> Required at the top level </xs:documentation> </xs:annotation> </xs:attribute> - <xs:anyAttribute namespace="##other" processContents="lax"/> + <xs:anyAttribute namespace="##other" processContents="lax"/> </xs:restriction> </xs:complexContent> </xs:complexType> - <xs:complexType name="localSimpleType"> <xs:complexContent> <xs:restriction base="xs:simpleType"> @@ -2209,72 +1648,59 @@ use</xs:documentation> </xs:annotation> </xs:attribute> <xs:attribute name="final" use="prohibited"/> - <xs:anyAttribute namespace="##other" processContents="lax"/> + <xs:anyAttribute namespace="##other" processContents="lax"/> </xs:restriction> </xs:complexContent> </xs:complexType> - <xs:element name="simpleType" type="xs:topLevelSimpleType" id="simpleType"> <xs:annotation> <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#element-simpleType"/> + source="http://www.w3.org/TR/xmlschema11-2/#element-simpleType"/> + </xs:annotation> + </xs:element> + <xs:element name="facet" abstract="true"> + <xs:annotation> + <xs:documentation> + An abstract element, representing facets in general. + The facets defined by this spec are substitutable for + this element, and implementation-defined facets should + also name this as a substitution-group head. + </xs:documentation> </xs:annotation> </xs:element> - - <xs:group name="facets"> - <xs:annotation> - <xs:documentation> - We should use a substitution group for facets, but - that's ruled out because it would allow users to - add their own, which we're not ready for yet. - </xs:documentation> - </xs:annotation> - <xs:choice> - <xs:element ref="xs:minExclusive"/> - <xs:element ref="xs:minInclusive"/> - <xs:element ref="xs:maxExclusive"/> - <xs:element ref="xs:maxInclusive"/> - <xs:element ref="xs:totalDigits"/> - <xs:element ref="xs:fractionDigits"/> - <xs:element ref="xs:length"/> - <xs:element ref="xs:minLength"/> - <xs:element ref="xs:maxLength"/> - <xs:element ref="xs:enumeration"/> - <xs:element ref="xs:whiteSpace"/> - <xs:element ref="xs:pattern"/> - </xs:choice> - </xs:group> - <xs:group name="simpleRestrictionModel"> - <xs:sequence> - <xs:element name="simpleType" type="xs:localSimpleType" minOccurs="0"/> - <xs:group ref="xs:facets" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> + <xs:sequence> + <xs:element name="simpleType" type="xs:localSimpleType" minOccurs="0"/> + <xs:choice minOccurs="0" + maxOccurs="unbounded"> + <xs:element ref="xs:facet"/> + <xs:any processContents="lax" + namespace="##other"/> + </xs:choice> + </xs:sequence> </xs:group> - <xs:element name="restriction" id="restriction"> - <xs:complexType> - <xs:annotation> - <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#element-restriction"> + <xs:complexType> + <xs:annotation> + <xs:documentation + source="http://www.w3.org/TR/xmlschema11-2/#element-restriction"> base attribute and simpleType child are mutually exclusive, but one or other is required </xs:documentation> </xs:annotation> <xs:complexContent> <xs:extension base="xs:annotated"> - <xs:group ref="xs:simpleRestrictionModel"/> - <xs:attribute name="base" type="xs:QName" use="optional"/> + <xs:group ref="xs:simpleRestrictionModel"/> + <xs:attribute name="base" type="xs:QName" use="optional"/> </xs:extension> </xs:complexContent> </xs:complexType> </xs:element> - <xs:element name="list" id="list"> - <xs:complexType> - <xs:annotation> - <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#element-list"> + <xs:complexType> + <xs:annotation> + <xs:documentation + source="http://www.w3.org/TR/xmlschema11-2/#element-list"> itemType attribute and simpleType child are mutually exclusive, but one or other is required </xs:documentation> @@ -2283,19 +1709,18 @@ use</xs:documentation> <xs:extension base="xs:annotated"> <xs:sequence> <xs:element name="simpleType" type="xs:localSimpleType" - minOccurs="0"/> + minOccurs="0"/> </xs:sequence> <xs:attribute name="itemType" type="xs:QName" use="optional"/> </xs:extension> </xs:complexContent> </xs:complexType> </xs:element> - <xs:element name="union" id="union"> - <xs:complexType> - <xs:annotation> - <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#element-union"> + <xs:complexType> + <xs:annotation> + <xs:documentation + source="http://www.w3.org/TR/xmlschema11-2/#element-union"> memberTypes attribute must be non-empty or there must be at least one simpleType child </xs:documentation> @@ -2304,7 +1729,7 @@ use</xs:documentation> <xs:extension base="xs:annotated"> <xs:sequence> <xs:element name="simpleType" type="xs:localSimpleType" - minOccurs="0" maxOccurs="unbounded"/> + minOccurs="0" maxOccurs="unbounded"/> </xs:sequence> <xs:attribute name="memberTypes" use="optional"> <xs:simpleType> @@ -2315,71 +1740,88 @@ use</xs:documentation> </xs:complexContent> </xs:complexType> </xs:element> - <xs:complexType name="facet"> <xs:complexContent> <xs:extension base="xs:annotated"> <xs:attribute name="value" use="required"/> - <xs:attribute name="fixed" type="xs:boolean" use="optional" - default="false"/> + <xs:attribute name="fixed" type="xs:boolean" default="false" + use="optional"/> </xs:extension> </xs:complexContent> </xs:complexType> - - <xs:complexType name="noFixedFacet"> - <xs:complexContent> - <xs:restriction base="xs:facet"> - <xs:sequence> - <xs:element ref="xs:annotation" minOccurs="0"/> - </xs:sequence> - <xs:attribute name="fixed" use="prohibited"/> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:restriction> - </xs:complexContent> - </xs:complexType> - - <xs:element name="minExclusive" id="minExclusive" type="xs:facet"> + <xs:complexType name="noFixedFacet"> + <xs:complexContent> + <xs:restriction base="xs:facet"> + <xs:sequence> + <xs:element ref="xs:annotation" minOccurs="0"/> + </xs:sequence> + <xs:attribute name="fixed" use="prohibited"/> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + <xs:element name="minExclusive" type="xs:facet" + id="minExclusive" + substitutionGroup="xs:facet"> <xs:annotation> <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#element-minExclusive"/> + source="http://www.w3.org/TR/xmlschema11-2/#element-minExclusive"/> </xs:annotation> </xs:element> - <xs:element name="minInclusive" id="minInclusive" type="xs:facet"> + <xs:element name="minInclusive" type="xs:facet" + id="minInclusive" + substitutionGroup="xs:facet"> <xs:annotation> <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#element-minInclusive"/> + source="http://www.w3.org/TR/xmlschema11-2/#element-minInclusive"/> </xs:annotation> </xs:element> - - <xs:element name="maxExclusive" id="maxExclusive" type="xs:facet"> + <xs:element name="maxExclusive" type="xs:facet" + id="maxExclusive" + substitutionGroup="xs:facet"> <xs:annotation> <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#element-maxExclusive"/> + source="http://www.w3.org/TR/xmlschema11-2/#element-maxExclusive"/> </xs:annotation> </xs:element> - <xs:element name="maxInclusive" id="maxInclusive" type="xs:facet"> + <xs:element name="maxInclusive" type="xs:facet" + id="maxInclusive" + substitutionGroup="xs:facet"> <xs:annotation> <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#element-maxInclusive"/> + source="http://www.w3.org/TR/xmlschema11-2/#element-maxInclusive"/> </xs:annotation> </xs:element> - <xs:complexType name="numFacet"> <xs:complexContent> <xs:restriction base="xs:facet"> - <xs:sequence> - <xs:element ref="xs:annotation" minOccurs="0"/> - </xs:sequence> - <xs:attribute name="value" type="xs:nonNegativeInteger" use="required"/> - <xs:anyAttribute namespace="##other" processContents="lax"/> + <xs:sequence> + <xs:element ref="xs:annotation" minOccurs="0"/> + </xs:sequence> + <xs:attribute name="value" + type="xs:nonNegativeInteger" use="required"/> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="intFacet"> + <xs:complexContent> + <xs:restriction base="xs:facet"> + <xs:sequence> + <xs:element ref="xs:annotation" minOccurs="0"/> + </xs:sequence> + <xs:attribute name="value" type="xs:integer" use="required"/> + <xs:anyAttribute namespace="##other" processContents="lax"/> </xs:restriction> </xs:complexContent> </xs:complexType> - <xs:element name="totalDigits" id="totalDigits"> + <xs:element name="totalDigits" id="totalDigits" + substitutionGroup="xs:facet"> <xs:annotation> <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#element-totalDigits"/> + source="http://www.w3.org/TR/xmlschema11-2/#element-totalDigits"/> </xs:annotation> <xs:complexType> <xs:complexContent> @@ -2388,48 +1830,56 @@ use</xs:documentation> <xs:element ref="xs:annotation" minOccurs="0"/> </xs:sequence> <xs:attribute name="value" type="xs:positiveInteger" use="required"/> - <xs:anyAttribute namespace="##other" processContents="lax"/> + <xs:anyAttribute namespace="##other" processContents="lax"/> </xs:restriction> </xs:complexContent> </xs:complexType> </xs:element> - <xs:element name="fractionDigits" id="fractionDigits" type="xs:numFacet"> + <xs:element name="fractionDigits" type="xs:numFacet" + id="fractionDigits" + substitutionGroup="xs:facet"> <xs:annotation> <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#element-fractionDigits"/> + source="http://www.w3.org/TR/xmlschema11-2/#element-fractionDigits"/> </xs:annotation> </xs:element> - <xs:element name="length" id="length" type="xs:numFacet"> + <xs:element name="length" type="xs:numFacet" id="length" + substitutionGroup="xs:facet"> <xs:annotation> <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#element-length"/> + source="http://www.w3.org/TR/xmlschema11-2/#element-length"/> </xs:annotation> </xs:element> - <xs:element name="minLength" id="minLength" type="xs:numFacet"> + <xs:element name="minLength" type="xs:numFacet" + id="minLength" + substitutionGroup="xs:facet"> <xs:annotation> <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#element-minLength"/> + source="http://www.w3.org/TR/xmlschema11-2/#element-minLength"/> </xs:annotation> </xs:element> - <xs:element name="maxLength" id="maxLength" type="xs:numFacet"> + <xs:element name="maxLength" type="xs:numFacet" + id="maxLength" + substitutionGroup="xs:facet"> <xs:annotation> <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#element-maxLength"/> + source="http://www.w3.org/TR/xmlschema11-2/#element-maxLength"/> </xs:annotation> </xs:element> - - <xs:element name="enumeration" id="enumeration" type="xs:noFixedFacet"> + <xs:element name="enumeration" type="xs:noFixedFacet" + id="enumeration" + substitutionGroup="xs:facet"> <xs:annotation> <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#element-enumeration"/> + source="http://www.w3.org/TR/xmlschema11-2/#element-enumeration"/> </xs:annotation> </xs:element> - - <xs:element name="whiteSpace" id="whiteSpace"> + <xs:element name="whiteSpace" id="whiteSpace" + substitutionGroup="xs:facet"> <xs:annotation> <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#element-whiteSpace"/> + source="http://www.w3.org/TR/xmlschema11-2/#element-whiteSpace"/> </xs:annotation> <xs:complexType> <xs:complexContent> @@ -2446,16 +1896,16 @@ use</xs:documentation> </xs:restriction> </xs:simpleType> </xs:attribute> - <xs:anyAttribute namespace="##other" processContents="lax"/> + <xs:anyAttribute namespace="##other" processContents="lax"/> </xs:restriction> </xs:complexContent> </xs:complexType> </xs:element> - - <xs:element name="pattern" id="pattern"> + <xs:element name="pattern" id="pattern" + substitutionGroup="xs:facet"> <xs:annotation> <xs:documentation - source="http://www.w3.org/TR/xmlschema-2/#element-pattern"/> + source="http://www.w3.org/TR/xmlschema11-2/#element-pattern"/> </xs:annotation> <xs:complexType> <xs:complexContent> @@ -2463,11 +1913,85 @@ use</xs:documentation> <xs:sequence> <xs:element ref="xs:annotation" minOccurs="0"/> </xs:sequence> - <xs:attribute name="value" type="xs:string" use="required"/> - <xs:anyAttribute namespace="##other" processContents="lax"/> + <xs:attribute name="value" type="xs:string" + use="required"/> + <xs:anyAttribute namespace="##other" + processContents="lax"/> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + </xs:element> + <xs:element name="assertion" type="xs:assertion" + id="assertion" substitutionGroup="xs:facet"> + <xs:annotation> + <xs:documentation + source="http://www.w3.org/TR/xmlschema11-2/#element-assertion"/> + </xs:annotation> + </xs:element> + <xs:element name="explicitTimezone" id="explicitTimezone" + substitutionGroup="xs:facet"> + <xs:annotation> + <xs:documentation + source="http://www.w3.org/TR/xmlschema11-2/#element-explicitTimezone"/> + </xs:annotation> + <xs:complexType> + <xs:complexContent> + <xs:restriction base="xs:facet"> + <xs:sequence> + <xs:element ref="xs:annotation" minOccurs="0"/> + </xs:sequence> + <xs:attribute name="value" use="required"> + <xs:simpleType> + <xs:restriction base="xs:NMTOKEN"> + <xs:enumeration value="optional"/> + <xs:enumeration value="required"/> + <xs:enumeration value="prohibited"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + <xs:anyAttribute namespace="##other" processContents="lax"/> </xs:restriction> </xs:complexContent> </xs:complexType> </xs:element> -</xs:schema> + <xs:annotation> + <xs:documentation> + In keeping with the XML Schema WG's standard versioning policy, + this schema document will persist at the URI + http://www.w3.org/2012/04/datatypes.xsd. + + At the date of issue it can also be found at the URI + http://www.w3.org/2009/XMLSchema/datatypes.xsd. + + The schema document at that URI may however change in the future, + in order to remain compatible with the latest version of XSD + and its namespace. In other words, if XSD or the XML Schema + namespace change, the version of this document at + http://www.w3.org/2009/XMLSchema/datatypes.xsd will change accordingly; + the version at http://www.w3.org/2012/04/datatypes.xsd will not change. + + Previous dated (and unchanging) versions of this schema document + include: + + http://www.w3.org/2012/01/datatypes.xsd + (XSD 1.1 Proposed Recommendation) + + http://www.w3.org/2011/07/datatypes.xsd + (XSD 1.1 Candidate Recommendation) + + http://www.w3.org/2009/04/datatypes.xsd + (XSD 1.1 Candidate Recommendation) + + http://www.w3.org/2004/10/datatypes.xsd + (XSD 1.0 Recommendation, Second Edition) + + http://www.w3.org/2001/05/datatypes.xsd + (XSD 1.0 Recommendation, First Edition) + + </xs:documentation> + </xs:annotation> + + + +</xs:schema> \ No newline at end of file diff --git a/xml.schema.completion/test/unit/src/org/netbeans/modules/xml/schema/completion/BasicCompletionTest.java b/xml.schema.completion/test/unit/src/org/netbeans/modules/xml/schema/completion/BasicCompletionTest.java index 2fd555784..1082d1ada 100644 --- a/xml.schema.completion/test/unit/src/org/netbeans/modules/xml/schema/completion/BasicCompletionTest.java +++ b/xml.schema.completion/test/unit/src/org/netbeans/modules/xml/schema/completion/BasicCompletionTest.java @@ -41,19 +41,21 @@ public static Test suite() { suite.addTest(new BasicCompletionTest("testNoNamespaceCompletion")); suite.addTest(new BasicCompletionTest("testNoNamespaceCompletion1")); suite.addTest(new BasicCompletionTest("testNoNamespaceCompletion2")); - suite.addTest(new BasicCompletionTest("testPurchaseOrder")); - suite.addTest(new BasicCompletionTest("testPurchaseOrder1")); - suite.addTest(new BasicCompletionTest("testPurchaseOrder2")); - suite.addTest(new BasicCompletionTest("testCompletionFilter1")); - suite.addTest(new BasicCompletionTest("testCompletionFilter2")); +// Disabled as referenced XSD file were partly not donated by oracle to apache +// suite.addTest(new BasicCompletionTest("testPurchaseOrder")); +// suite.addTest(new BasicCompletionTest("testPurchaseOrder1")); +// suite.addTest(new BasicCompletionTest("testPurchaseOrder2")); +// suite.addTest(new BasicCompletionTest("testCompletionFilter1")); +// suite.addTest(new BasicCompletionTest("testCompletionFilter2")); suite.addTest(new BasicCompletionTest("testEmptyTag1")); suite.addTest(new BasicCompletionTest("testEmptyTag2")); suite.addTest(new BasicCompletionTest("testEmptyTag3")); suite.addTest(new BasicCompletionTest("testEmptyTag4")); - suite.addTest(new BasicCompletionTest("testEndtagCompletion1")); - suite.addTest(new BasicCompletionTest("testEndtagCompletion2")); - suite.addTest(new BasicCompletionTest("testEndtagCompletion3")); - suite.addTest(new BasicCompletionTest("testCompletionWithAmpersand")); +// Disabled as referenced XSD file were partly not donated by oracle to apache +// suite.addTest(new BasicCompletionTest("testEndtagCompletion1")); +// suite.addTest(new BasicCompletionTest("testEndtagCompletion2")); +// suite.addTest(new BasicCompletionTest("testEndtagCompletion3")); +// suite.addTest(new BasicCompletionTest("testCompletionWithAmpersand")); // disabled since it accesses Net: // suite.addTest(new BasicCompletionTest("testSchemaFromRuntimeCatalog")); //suite.addTest(new BasicCompletionTest("testCompletionUsingSchemaFromCatalog")); @@ -66,10 +68,11 @@ public static Test suite() { suite.addTest(new BasicCompletionTest("testChildren2")); suite.addTest(new BasicCompletionTest("testImport1")); suite.addTest(new BasicCompletionTest("testInclude1")); - suite.addTest(new BasicCompletionTest("testElementValueCompletion1")); - suite.addTest(new BasicCompletionTest("testElementValueCompletion2")); - suite.addTest(new BasicCompletionTest("testAttributeValueCompletion1")); - suite.addTest(new BasicCompletionTest("testAttributeValueCompletion2")); +// Disabled as referenced XSD file were partly not donated by oracle to apache +// suite.addTest(new BasicCompletionTest("testElementValueCompletion1")); +// suite.addTest(new BasicCompletionTest("testElementValueCompletion2")); +// suite.addTest(new BasicCompletionTest("testAttributeValueCompletion1")); +// suite.addTest(new BasicCompletionTest("testAttributeValueCompletion2")); return suite; } diff --git a/xml.schema.completion/test/unit/src/org/netbeans/modules/xml/schema/completion/CompletionPerfTest.java b/xml.schema.completion/test/unit/src/org/netbeans/modules/xml/schema/completion/CompletionPerfTest.java index 2bd56e5d4..e986a6083 100644 --- a/xml.schema.completion/test/unit/src/org/netbeans/modules/xml/schema/completion/CompletionPerfTest.java +++ b/xml.schema.completion/test/unit/src/org/netbeans/modules/xml/schema/completion/CompletionPerfTest.java @@ -34,7 +34,9 @@ public CompletionPerfTest(String testName) { } public static Test suite() { - TestSuite suite = new TestSuite(CompletionPerfTest.class); + TestSuite suite = new TestSuite(); +// Disabled as referenced XSD file were partly not donated by oracle to apache +// suite.addTestSuite(CompletionPerfTest.class); return suite; } diff --git a/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/SchemaRefCacheTest.java b/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/SchemaRefCacheTest.java index 2f492c4bd..3ba848abd 100644 --- a/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/SchemaRefCacheTest.java +++ b/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/SchemaRefCacheTest.java @@ -76,7 +76,8 @@ public static Test suite() { suite.addTest(new SchemaRefCacheTest("testRedefinedTargetNamespaceChanged")); // NOI18N suite.addTest(new SchemaRefCacheTest("testImportedTargetNamespaceDeleted")); // NOI18N suite.addTest(new SchemaRefCacheTest("testDetachedSchemaGarbageCollected")); // NOI18N - suite.addTest(new SchemaRefCacheTest("testCacheContainsRelevantComponents")); // NOI18N +// Disabled as referenced files were partly not donated by oracle to apache +// suite.addTest(new SchemaRefCacheTest("testCacheContainsRelevantComponents")); // NOI18N return suite; } diff --git a/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/impl/MultiFileTest.java b/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/impl/MultiFileTest.java index 9395877db..be7cc00c7 100644 --- a/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/impl/MultiFileTest.java +++ b/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/impl/MultiFileTest.java @@ -40,78 +40,77 @@ import org.openide.filesystems.FileUtil; /** - * - * @author Administrator + * Disabled as referenced files were partly not donated by oracle to apache */ -public class MultiFileTest extends TestCase { - - private static String TEST_XSD = "resources/OrgChart.xsd"; - - public MultiFileTest(String testName) { - super(testName); - } - - protected void setUp() throws Exception { - } - - protected void tearDown() throws Exception { - TestCatalogModel.getDefault().clearDocumentPool(); - } - - public void testGetImportedModelSources() throws Exception { - if ( ! NamespaceLocation.ADDRESS.getResourceFile().exists() ) { - NamespaceLocation.ADDRESS.refreshResourceFile(); - } - SchemaModel sm = TestCatalogModel.getDefault().getSchemaModel(NamespaceLocation.ORGCHART); - // get imported model sources - SchemaImpl schema = (SchemaImpl)sm.getSchema(); - Collection<Import> importedModelSources = new LinkedList<Import>(schema.getImports()); - assertEquals("should be six imports", 6 ,importedModelSources.size()); - Iterator<Import> itr = importedModelSources.iterator(); - while(itr.hasNext()) { - Import i = itr.next(); - try { - SchemaModel sm2 = i.resolveReferencedModel(); - } catch (CatalogModelException ex) { - itr.remove(); - } - } - assertEquals("only two imports are reachable", 1,importedModelSources.size()); - - ModelSource importedModelSource = importedModelSources.iterator().next().resolveReferencedModel().getModelSource(); - assertEquals("address.xsd",((FileObject)importedModelSource.getLookup().lookup(FileObject.class)).getNameExt()); - // get imported model - ModelSource testImportedModelSource = TestCatalogModel.getDefault().createTestModelSource((FileObject) importedModelSource.getLookup().lookup(FileObject.class), false); - SchemaModel sm1 = SchemaModelFactory.getDefault().getModel(testImportedModelSource); - assertNotNull(sm1); - assertEquals("http://www.altova.com/IPO",sm1.getSchema().getTargetNamespace()); - } - - public void testGetIncludedModelSources() throws Exception { - // get the model for OrgChart.xsd - URL orgChartUrl = getClass().getResource("../resources/ipo.xsd"); - File orgChartFile = new File(orgChartUrl.toURI()); - FileObject orgChartFileObj = FileUtil.toFileObject(orgChartFile); - //ModelSource localTestModelSource = new TestModelSource(orgChartFileObj,false); - ModelSource testModelSource = TestCatalogModel.getDefault().createTestModelSource(orgChartFileObj, false); - SchemaModel sm = SchemaModelFactory.getDefault().getModel(testModelSource); - - //register address.xsd with relative location (this is to be done only once - URL addressUrl = getClass().getResource("../resources/address.xsd"); - TestCatalogModel.getDefault().addURI(new URI("address.xsd"),addressUrl.toURI()); - - // get included model sources - SchemaImpl schema = (SchemaImpl)sm.getSchema(); - Collection<Include> includedModelSources = schema.getIncludes(); - assertEquals(1,includedModelSources.size()); - - ModelSource importedModelSource = includedModelSources.iterator().next().resolveReferencedModel().getModelSource(); - assertEquals("address.xsd",((FileObject)importedModelSource.getLookup().lookup(FileObject.class)).getNameExt()); - - // get included model - ModelSource testImportedModelSource = TestCatalogModel.getDefault().createTestModelSource((FileObject) importedModelSource.getLookup().lookup(FileObject.class), false); - SchemaModel sm1 = SchemaModelFactory.getDefault().getModel(testImportedModelSource); - assertNotNull(sm1); - assertEquals(schema.getTargetNamespace(),sm1.getSchema().getTargetNamespace()); - } -} +//public class MultiFileTest extends TestCase { +// +// private static String TEST_XSD = "resources/OrgChart.xsd"; +// +// public MultiFileTest(String testName) { +// super(testName); +// } +// +// protected void setUp() throws Exception { +// } +// +// protected void tearDown() throws Exception { +// TestCatalogModel.getDefault().clearDocumentPool(); +// } +// +// public void testGetImportedModelSources() throws Exception { +// if ( ! NamespaceLocation.ADDRESS.getResourceFile().exists() ) { +// NamespaceLocation.ADDRESS.refreshResourceFile(); +// } +// SchemaModel sm = TestCatalogModel.getDefault().getSchemaModel(NamespaceLocation.ORGCHART); +// // get imported model sources +// SchemaImpl schema = (SchemaImpl)sm.getSchema(); +// Collection<Import> importedModelSources = new LinkedList<Import>(schema.getImports()); +// assertEquals("should be six imports", 6 ,importedModelSources.size()); +// Iterator<Import> itr = importedModelSources.iterator(); +// while(itr.hasNext()) { +// Import i = itr.next(); +// try { +// SchemaModel sm2 = i.resolveReferencedModel(); +// } catch (CatalogModelException ex) { +// itr.remove(); +// } +// } +// assertEquals("only two imports are reachable", 1,importedModelSources.size()); +// +// ModelSource importedModelSource = importedModelSources.iterator().next().resolveReferencedModel().getModelSource(); +// assertEquals("address.xsd",((FileObject)importedModelSource.getLookup().lookup(FileObject.class)).getNameExt()); +// // get imported model +// ModelSource testImportedModelSource = TestCatalogModel.getDefault().createTestModelSource((FileObject) importedModelSource.getLookup().lookup(FileObject.class), false); +// SchemaModel sm1 = SchemaModelFactory.getDefault().getModel(testImportedModelSource); +// assertNotNull(sm1); +// assertEquals("http://www.altova.com/IPO",sm1.getSchema().getTargetNamespace()); +// } +// +// public void testGetIncludedModelSources() throws Exception { +// // get the model for OrgChart.xsd +// URL orgChartUrl = getClass().getResource("../resources/ipo.xsd"); +// File orgChartFile = new File(orgChartUrl.toURI()); +// FileObject orgChartFileObj = FileUtil.toFileObject(orgChartFile); +// //ModelSource localTestModelSource = new TestModelSource(orgChartFileObj,false); +// ModelSource testModelSource = TestCatalogModel.getDefault().createTestModelSource(orgChartFileObj, false); +// SchemaModel sm = SchemaModelFactory.getDefault().getModel(testModelSource); +// +// //register address.xsd with relative location (this is to be done only once +// URL addressUrl = getClass().getResource("../resources/address.xsd"); +// TestCatalogModel.getDefault().addURI(new URI("address.xsd"),addressUrl.toURI()); +// +// // get included model sources +// SchemaImpl schema = (SchemaImpl)sm.getSchema(); +// Collection<Include> includedModelSources = schema.getIncludes(); +// assertEquals(1,includedModelSources.size()); +// +// ModelSource importedModelSource = includedModelSources.iterator().next().resolveReferencedModel().getModelSource(); +// assertEquals("address.xsd",((FileObject)importedModelSource.getLookup().lookup(FileObject.class)).getNameExt()); +// +// // get included model +// ModelSource testImportedModelSource = TestCatalogModel.getDefault().createTestModelSource((FileObject) importedModelSource.getLookup().lookup(FileObject.class), false); +// SchemaModel sm1 = SchemaModelFactory.getDefault().getModel(testImportedModelSource); +// assertNotNull(sm1); +// assertEquals(schema.getTargetNamespace(),sm1.getSchema().getTargetNamespace()); +// } +//} diff --git a/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/impl/SchemaComponentImplTest.java b/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/impl/SchemaComponentImplTest.java index d32d56dbe..4a6fd88be 100644 --- a/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/impl/SchemaComponentImplTest.java +++ b/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/impl/SchemaComponentImplTest.java @@ -133,51 +133,52 @@ public void testGetAnnotations() throws IOException { assertNotNull("only one annotation should be present", ann); } - public void testSetGlobalReference() throws Exception { - SchemaModel mod = Util.loadSchemaModel("resources/ipo.xsd"); - Schema schema = mod.getSchema(); - SchemaComponentFactory fact = mod.getFactory(); - - mod.startTransaction(); - GlobalAttributeGroup gap = fact.createGlobalAttributeGroup(); - schema.addAttributeGroup(gap); - gap.setName("myAttrGroup2"); - LocalAttribute ga = fact.createLocalAttribute(); - gap.addLocalAttribute(ga); - ga.setName("ga"); - GlobalSimpleType gst = FindSchemaComponentFromDOM.find( - GlobalSimpleType.class, schema, "/schema/simpleType[@name='Sku']"); - ga.setType(ga.createReferenceTo(gst, GlobalSimpleType.class)); - - mod.endTransaction(); - - String v = ((AbstractDocumentComponent)ga).getPeer().getAttribute("type"); - assertEquals("ref should have prefix", "ipo:Sku", v); - - mod.startTransaction(); - /* - <complexType name="myCT"> - <sequence> - <simpleType name="productName" type="xsd:string"/> - <attributeGroup ref="ipo:myAttrGroup2"/> - </complexType> - */ - GlobalComplexType gct = fact.createGlobalComplexType(); - schema.addComplexType(gct); - gct.setName("myCT"); - Sequence seq = Util.createSequence(mod, gct); - LocalElement le = Util.createLocalElement(mod, seq, "productName", 0); - le.setType(le.createReferenceTo(Util.getPrimitiveType("string"), GlobalSimpleType.class)); - - AttributeGroupReference agr = fact.createAttributeGroupReference(); - gct.addAttributeGroupReference(agr); - agr.setGroup(agr.createReferenceTo(gap, GlobalAttributeGroup.class)); - - mod.endTransaction(); - - v = ((AbstractDocumentComponent)agr).getPeer().getAttribute("ref"); - assertEquals("ref should have prefix", "ipo:myAttrGroup2", v); - } +// Disabled as referenced files were partly not donated by oracle to apache +// public void testSetGlobalReference() throws Exception { +// SchemaModel mod = Util.loadSchemaModel("resources/ipo.xsd"); +// Schema schema = mod.getSchema(); +// SchemaComponentFactory fact = mod.getFactory(); +// +// mod.startTransaction(); +// GlobalAttributeGroup gap = fact.createGlobalAttributeGroup(); +// schema.addAttributeGroup(gap); +// gap.setName("myAttrGroup2"); +// LocalAttribute ga = fact.createLocalAttribute(); +// gap.addLocalAttribute(ga); +// ga.setName("ga"); +// GlobalSimpleType gst = FindSchemaComponentFromDOM.find( +// GlobalSimpleType.class, schema, "/schema/simpleType[@name='Sku']"); +// ga.setType(ga.createReferenceTo(gst, GlobalSimpleType.class)); +// +// mod.endTransaction(); +// +// String v = ((AbstractDocumentComponent)ga).getPeer().getAttribute("type"); +// assertEquals("ref should have prefix", "ipo:Sku", v); +// +// mod.startTransaction(); +// /* +// <complexType name="myCT"> +// <sequence> +// <simpleType name="productName" type="xsd:string"/> +// <attributeGroup ref="ipo:myAttrGroup2"/> +// </complexType> +// */ +// GlobalComplexType gct = fact.createGlobalComplexType(); +// schema.addComplexType(gct); +// gct.setName("myCT"); +// Sequence seq = Util.createSequence(mod, gct); +// LocalElement le = Util.createLocalElement(mod, seq, "productName", 0); +// le.setType(le.createReferenceTo(Util.getPrimitiveType("string"), GlobalSimpleType.class)); +// +// AttributeGroupReference agr = fact.createAttributeGroupReference(); +// gct.addAttributeGroupReference(agr); +// agr.setGroup(agr.createReferenceTo(gap, GlobalAttributeGroup.class)); +// +// mod.endTransaction(); +// +// v = ((AbstractDocumentComponent)agr).getPeer().getAttribute("ref"); +// assertEquals("ref should have prefix", "ipo:myAttrGroup2", v); +// } public void testSetAndGetID() throws Exception { assertNull("id attribute is optional", schema.getId()); diff --git a/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/impl/xdm/CutPasteTest.java b/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/impl/xdm/CutPasteTest.java index 0325a2422..f4aae0ac6 100644 --- a/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/impl/xdm/CutPasteTest.java +++ b/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/impl/xdm/CutPasteTest.java @@ -113,65 +113,63 @@ public void testCutPasteLocalElement() throws Exception { ((NodeImpl)leti.getPeer()).getId()!=((NodeImpl)le2.getPeer()).getId()); } - /** - * testMultipleDnDAndUndo - */ - public void testMultipleDnDAndUndo() throws Exception { - SchemaModel model = Util.loadSchemaModel("resources/PO_copypasteundoSequence.xsd"); - UndoManager um = new UndoManager(); - model.addUndoableEditListener(um); - - Sequence seq = (Sequence)Util.findComponent( - model.getSchema(), - "/schema/complexType[@name='PurchaseOrderType']/sequence"); - assert(seq != null); - LocalElement shipTo = (LocalElement)Util.findComponent( - model.getSchema(), - "/schema/complexType[@name='PurchaseOrderType']/" + - "sequence/element[@name='shipTo']"); - assert(shipTo != null); - ElementReference comment = (ElementReference)Util.findComponent( - model.getSchema(), - "/schema/complexType[@name='PurchaseOrderType']/" + - "sequence/element[@ref='comment']"); - assert(comment != null); - - assertEquals(4, seq.getChildren().size()); - LocalElement copy_shipTo = (LocalElement) shipTo.copy(seq); - model.startTransaction(); - seq.removeContent(shipTo); - seq.addContent(copy_shipTo, 3); - model.endTransaction(); - assertEquals(4, seq.getChildren().size()); - - um.undo(); - assertEquals(4, seq.getChildren().size()); - - seq = (Sequence)Util.findComponent( - model.getSchema(), - "/schema/complexType[@name='PurchaseOrderType']/sequence"); - assert(seq != null); - shipTo = (LocalElement)Util.findComponent( - model.getSchema(), - "/schema/complexType[@name='PurchaseOrderType']/" + - "sequence/element[@name='shipTo']"); - assert(shipTo != null); - comment = (ElementReference)Util.findComponent( - model.getSchema(), - "/schema/complexType[@name='PurchaseOrderType']/" + - "sequence/element[@ref='comment']"); - assert(comment != null); - - ElementReference copy_comment = (ElementReference) comment.copy(seq); - model.startTransaction(); - seq.removeContent(comment); - seq.addContent(copy_comment, 1); - model.endTransaction(); - assertEquals(4, seq.getChildren().size()); - - um.undo(); - assertEquals(4, seq.getChildren().size()); - } +// Disabled as referenced files were partly not donated by oracle to apache +// public void testMultipleDnDAndUndo() throws Exception { +// SchemaModel model = Util.loadSchemaModel("resources/PO_copypasteundoSequence.xsd"); +// UndoManager um = new UndoManager(); +// model.addUndoableEditListener(um); +// +// Sequence seq = (Sequence)Util.findComponent( +// model.getSchema(), +// "/schema/complexType[@name='PurchaseOrderType']/sequence"); +// assert(seq != null); +// LocalElement shipTo = (LocalElement)Util.findComponent( +// model.getSchema(), +// "/schema/complexType[@name='PurchaseOrderType']/" + +// "sequence/element[@name='shipTo']"); +// assert(shipTo != null); +// ElementReference comment = (ElementReference)Util.findComponent( +// model.getSchema(), +// "/schema/complexType[@name='PurchaseOrderType']/" + +// "sequence/element[@ref='comment']"); +// assert(comment != null); +// +// assertEquals(4, seq.getChildren().size()); +// LocalElement copy_shipTo = (LocalElement) shipTo.copy(seq); +// model.startTransaction(); +// seq.removeContent(shipTo); +// seq.addContent(copy_shipTo, 3); +// model.endTransaction(); +// assertEquals(4, seq.getChildren().size()); +// +// um.undo(); +// assertEquals(4, seq.getChildren().size()); +// +// seq = (Sequence)Util.findComponent( +// model.getSchema(), +// "/schema/complexType[@name='PurchaseOrderType']/sequence"); +// assert(seq != null); +// shipTo = (LocalElement)Util.findComponent( +// model.getSchema(), +// "/schema/complexType[@name='PurchaseOrderType']/" + +// "sequence/element[@name='shipTo']"); +// assert(shipTo != null); +// comment = (ElementReference)Util.findComponent( +// model.getSchema(), +// "/schema/complexType[@name='PurchaseOrderType']/" + +// "sequence/element[@ref='comment']"); +// assert(comment != null); +// +// ElementReference copy_comment = (ElementReference) comment.copy(seq); +// model.startTransaction(); +// seq.removeContent(comment); +// seq.addContent(copy_comment, 1); +// model.endTransaction(); +// assertEquals(4, seq.getChildren().size()); +// +// um.undo(); +// assertEquals(4, seq.getChildren().size()); +// } private Document sd; private SchemaModel model; diff --git a/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/impl/xdm/SyncTest.java b/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/impl/xdm/SyncTest.java index 039fba2fd..f77f530e6 100644 --- a/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/impl/xdm/SyncTest.java +++ b/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/impl/xdm/SyncTest.java @@ -532,27 +532,28 @@ public void testSyncUndoUndo() throws Exception { assertEquals(3, seqChildren.size()); } - public void testUndoSequenceCopy() throws Exception { - SchemaModel model = Util.loadSchemaModel("resources/PO_copypasteundoSequence.xsd"); - UndoManager um = new UndoManager(); - model.addUndoableEditListener(um); - - GlobalComplexType gct = (GlobalComplexType)Util.findComponent( - model.getSchema(), "/schema/complexType[@name='Items']"); - Sequence seq1 = (Sequence) Util.findComponent( - model.getSchema(), "/schema/complexType[@name='USAddress']/sequence"); - assertEquals(1, gct.getDefinition().getChildren().size()); - assertEquals(5, seq1.getChildren().size()); - - Sequence seq2 = (Sequence) seq1.copy(gct); - model.startTransaction(); - gct.setDefinition(seq2); - model.endTransaction(); - assertEquals(5, gct.getDefinition().getChildren().size()); - - um.undo(); - assertEquals(1, gct.getDefinition().getChildren().size()); - } +// Disabled as referenced files were partly not donated by oracle to apache +// public void testUndoSequenceCopy() throws Exception { +// SchemaModel model = Util.loadSchemaModel("resources/PO_copypasteundoSequence.xsd"); +// UndoManager um = new UndoManager(); +// model.addUndoableEditListener(um); +// +// GlobalComplexType gct = (GlobalComplexType)Util.findComponent( +// model.getSchema(), "/schema/complexType[@name='Items']"); +// Sequence seq1 = (Sequence) Util.findComponent( +// model.getSchema(), "/schema/complexType[@name='USAddress']/sequence"); +// assertEquals(1, gct.getDefinition().getChildren().size()); +// assertEquals(5, seq1.getChildren().size()); +// +// Sequence seq2 = (Sequence) seq1.copy(gct); +// model.startTransaction(); +// gct.setDefinition(seq2); +// model.endTransaction(); +// assertEquals(5, gct.getDefinition().getChildren().size()); +// +// um.undo(); +// assertEquals(1, gct.getDefinition().getChildren().size()); +// } public void testSyncAnnotationRemoveId() throws Exception { SchemaModel model = Util.loadSchemaModel("resources/loanApplication_id.xsd"); diff --git a/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/visitor/FindUsageVisitorTest.java b/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/visitor/FindUsageVisitorTest.java index df7001c20..3352cb9db 100644 --- a/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/visitor/FindUsageVisitorTest.java +++ b/xml.schema.model/test/unit/src/org/netbeans/modules/xml/schema/model/visitor/FindUsageVisitorTest.java @@ -100,12 +100,13 @@ public static Test suite() { return suite; } - public void testFindPath() throws Exception { - setUp1(); - this.assertEquals(49, findUsageCountForItem(global_element)); - this.assertEquals(3, findUsageCountForItem(global_type)); - this.assertEquals(4, findUsageCountForItem(global_attribute_group)); - } +// Disabled as referenced files were partly not donated by oracle to apache +// public void testFindPath() throws Exception { +// setUp1(); +// this.assertEquals(49, findUsageCountForItem(global_element)); +// this.assertEquals(3, findUsageCountForItem(global_type)); +// this.assertEquals(4, findUsageCountForItem(global_attribute_group)); +// } public int findUsageCountForItem(NamedReferenceable<SchemaComponent> ref) { long startTime = System.currentTimeMillis(); diff --git a/xml.tax/l10n.list b/xml.tax/l10n.list index 083e4ffad..73c6a27e6 100644 --- a/xml.tax/l10n.list +++ b/xml.tax/l10n.list @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# # xml/tax read global ${l10n-module}/lib/src/**/Bundle*.properties diff --git a/xml.tax/lib/test/qa-functional/src/org/netbeans/tax/data/xstates.dtd b/xml.tax/lib/test/qa-functional/src/org/netbeans/tax/data/xstates.dtd index 354336739..a75ddc9f6 100644 --- a/xml.tax/lib/test/qa-functional/src/org/netbeans/tax/data/xstates.dtd +++ b/xml.tax/lib/test/qa-functional/src/org/netbeans/tax/data/xstates.dtd @@ -1,4 +1,24 @@ <?xml encoding="UTF-8" ?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- Created by mschovanek on October 23, 2000, 6:44 PM --> diff --git a/xml.tax/lib/test/qa-functional/src/org/netbeans/tax/io/data/dir/dir-b/level2.dtd b/xml.tax/lib/test/qa-functional/src/org/netbeans/tax/io/data/dir/dir-b/level2.dtd index 90990b3f3..5728c6dfd 100644 --- a/xml.tax/lib/test/qa-functional/src/org/netbeans/tax/io/data/dir/dir-b/level2.dtd +++ b/xml.tax/lib/test/qa-functional/src/org/netbeans/tax/io/data/dir/dir-b/level2.dtd @@ -1,3 +1,23 @@ +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!ELEMENT element-b (#PCDATA)> <!ENTITY % c SYSTEM "level3.dtd"> %c; \ No newline at end of file diff --git a/xml.tax/lib/test/qa-functional/src/org/netbeans/tax/io/data/dir/dir-b/level3.dtd b/xml.tax/lib/test/qa-functional/src/org/netbeans/tax/io/data/dir/dir-b/level3.dtd index 5e286fe7b..8ed476411 100644 --- a/xml.tax/lib/test/qa-functional/src/org/netbeans/tax/io/data/dir/dir-b/level3.dtd +++ b/xml.tax/lib/test/qa-functional/src/org/netbeans/tax/io/data/dir/dir-b/level3.dtd @@ -1 +1,21 @@ +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!ELEMENT element-c (#PCDATA)> diff --git a/xml.tax/lib/test/qa-functional/src/org/netbeans/tax/io/data/dir/level1.dtd b/xml.tax/lib/test/qa-functional/src/org/netbeans/tax/io/data/dir/level1.dtd index ad464d2b6..5463d8663 100644 --- a/xml.tax/lib/test/qa-functional/src/org/netbeans/tax/io/data/dir/level1.dtd +++ b/xml.tax/lib/test/qa-functional/src/org/netbeans/tax/io/data/dir/level1.dtd @@ -1,3 +1,23 @@ +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!ELEMENT element (#PCDATA)> <!ENTITY % b SYSTEM "dir-b/level2.dtd"> %b; \ No newline at end of file diff --git a/xml.tax/lib/test/unit/src/org/netbeans/tax/dom/data/Prototype.xml b/xml.tax/lib/test/unit/src/org/netbeans/tax/dom/data/Prototype.xml index 43c5e6875..cb70e843d 100644 --- a/xml.tax/lib/test/unit/src/org/netbeans/tax/dom/data/Prototype.xml +++ b/xml.tax/lib/test/unit/src/org/netbeans/tax/dom/data/Prototype.xml @@ -1,3 +1,23 @@ +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <root> <child attribute="value1"/> <text>data</text> diff --git a/xml.text.obsolete90/test/unit/data/goldenfiles/org/netbeans/modules/xml/text/indent/XMLFormatterTest/testReformatSample1.pass b/xml.text.obsolete90/test/unit/data/goldenfiles/org/netbeans/modules/xml/text/indent/XMLFormatterTest/testReformatSample1.pass index 11e1b782d..46cdf9238 100644 --- a/xml.text.obsolete90/test/unit/data/goldenfiles/org/netbeans/modules/xml/text/indent/XMLFormatterTest/testReformatSample1.pass +++ b/xml.text.obsolete90/test/unit/data/goldenfiles/org/netbeans/modules/xml/text/indent/XMLFormatterTest/testReformatSample1.pass @@ -1,5 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" diff --git a/xml.text.obsolete90/test/unit/data/goldenfiles/org/netbeans/modules/xml/text/indent/XMLFormatterTest/testReformatSample2-.pass b/xml.text.obsolete90/test/unit/data/goldenfiles/org/netbeans/modules/xml/text/indent/XMLFormatterTest/testReformatSample2-.pass deleted file mode 100644 index 700be9a76..000000000 --- a/xml.text.obsolete90/test/unit/data/goldenfiles/org/netbeans/modules/xml/text/indent/XMLFormatterTest/testReformatSample2-.pass +++ /dev/null @@ -1,1716 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> <!-- -*- sgml-indent-step: 2 -*- --> -<!-- -The contents of this file are subject to the terms of the Common Development -and Distribution License (the License). You may not use this file except in -compliance with the License. - -You can obtain a copy of the License at http://www.netbeans.org/cddl.html -or http://www.netbeans.org/cddl.txt. - -When distributing Covered Code, include this CDDL Header Notice in each file -and include the License file at http://www.netbeans.org/cddl.txt. -If applicable, add the following below the CDDL Header, with the fields -enclosed by brackets [] replaced by your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" - -The Original Software is NetBeans. The Initial Developer of the Original -Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun -Microsystems, Inc. All Rights Reserved. ---> -<project name="nbbuild" default="all" basedir="."> - - <import file="default.xml"/> - - <!-- To make people happy who want to do `ant clean all': --> - <target name="all" depends="build,commit-validation" description="Build the IDE and run basic validation tests."/> - - <target name="all-nozip" depends="build-nozip,commit-validation" description="Build the IDE (no ZIP file, unpacked) and run basic validation tests."/> - - <target name="assure-ant"> - <condition property="ant.version.is.good"> - <!-- this is in 1.6.3 only --> - <!-- actually needed for 'executable' attr on <javadoc>, at least --> - <available classname="org.apache.tools.ant.types.mappers.FilterMapper"/> - </condition> - <fail unless="ant.version.is.good"> - You need to have ant 1.6.3 at least to build NetBeans. - </fail> - </target> - - <target name="bootstrap" - description="Bootstrap NetBeans-specific Ant extensions." - depends="-jdk-init,-assure-jdk-1.4,assure-ant"> - <echo message="Bootstrapping NetBeans-specific Ant extensions..." - /> - <property name="ant.jar" value="${ant.home}/lib/ant.jar"/> - <path id="bootstrap-cp"> - <pathelement location="${ant.jar}"/> - <fileset dir=".."> - <!-- For JavaHelp indexing: --> - <include name="nbbuild/external/jhall*.jar"/> - </fileset> - </path> - <!-- Sanity check: --> - <pathconvert pathsep=":" property="class.files.in.antsrc"> - <path> - <fileset dir="antsrc"> - <include name="**/*.class"/> - </fileset> - </path> - </pathconvert> - <fail> - <condition> - <not> - <equals arg1="${class.files.in.antsrc}" arg2=""/> - </not> - </condition> - You have stray *.class files in ${basedir}/antsrc which you must remove. - Probably you failed to clean your sources before updating them from CVS. - </fail> - <!-- OK, continue: --> - <mkdir dir="build/antclasses"/> - <javac srcdir="antsrc" destdir="build/antclasses" deprecation="true" debug="${build.compiler.debug}" source="1.4"> - <classpath refid="bootstrap-cp"/> - </javac> - <jar jarfile="nbantext.jar"> - <fileset dir="build/antclasses"/> - <fileset dir="antsrc"> - <exclude name="**/*.java"/> - <exclude name="**/package.html"/> - <exclude name="package-list"/> - </fileset> - </jar> - </target> - - <target name="init-module-list" depends="bootstrap"> - <!-- Define modules. --> - <resolve name="modules" value="config.modules.${moduleconfig}"/> - <resolve name="fixedmodules" value="config.fixedmodules.${moduleconfig}"/> - <property name="allmodules" value="${fixedmodules},${modules}"/> - </target> - - <target name="set-buildnumber" unless="buildnumber"> - <tstamp> - <format property="buildnumber" pattern="yyMMdd"/> - </tstamp> - <tstamp> - <format property="buildday" pattern="d MMM yyyy" locale="en" /> - </tstamp> - </target> - - <target name="init" depends="init-module-list,set-buildnumber,init-tasks"> - <taskdef name="cleanall" classname="org.netbeans.nbbuild.CleanAll" classpath="nbantext.jar"/> - <taskdef name="nbmerge" classname="org.netbeans.nbbuild.NbMerge" classpath="nbantext.jar"/> - <taskdef name="for-each" classname="org.netbeans.nbbuild.ForEach" classpath="nbantext.jar"/> - <taskdef name="getdependsclusters" classname="org.netbeans.nbbuild.GetDependsClusters" classpath="nbantext.jar"/> - <taskdef name="repeat" classname="org.netbeans.nbbuild.Repeat" classpath="nbantext.jar"/> - - <!-- We need absolute path to ${netbeans.dest} --> - <property name="netbeans.dest.abs" location="${netbeans.dest}"/> - <!-- Overridable. Note: need not necessarily be a number at all): --> - <property name="buildnum" value="dev-${buildnumber}"/> - <property name="sanitystart.args" value="-J-Dnetbeans.close=true ${sanitystart.args.additional}"/> - - <!-- Set up automatic all-* targets: --> - <taskdef name="insert-module-all-targets" classname="org.netbeans.nbbuild.InsertModuleAllTargets" classpath="nbantext.jar"/> - <insert-module-all-targets/> - </target> - - <target name="all-java/storagebuilder" depends="init"> - <antcall target="build-one-cluster-dependencies" inheritall="false"> - <param name="one.cluster.dependencies" value="nb.cluster.platform,nb.cluster.ide"/> - <param name="one.cluster.name" value="this-cluster"/> - </antcall> - <echo message="Building java/storagebuilder library..."/> - <ant dir="../java/storagebuilder" target="jar"/> - </target> - - <target name="all-ide/branding" depends="init"> - <echo message="Building module ide/branding..."/> - <getdependsclusters name="dependsClusters" list="${nb.clusters.list}"/> - <antcall target="build-one-cluster-dependencies" inheritAll="false"> - <param name="one.cluster.dependencies" value="${dependsClusters}"/> - <param name="one.cluster.name" value="this-cluster"/> - </antcall> - <ant dir="../ide/branding" target="netbeans"/> - </target> - - <target name="all-installer" description="Dummy target for build system compatibility"/> - - <target name="all-tomcatint/tomcat5/bundled" depends="init"> - <getdependsclusters name="dependsClusters" list="${nb.clusters.list}"/> - <antcall target="build-one-cluster-dependencies" inheritAll="false"> - <param name="one.cluster.dependencies" value="${dependsClusters}"/> - <param name="one.cluster.name" value="this-cluster"/> - </antcall> - <!-- XXX this and xtest are clumsy: <antcall target="all-monitor"/> will not work since the subproject used by antcall does *not* have the synthetic targets! --> - <ant dir="../monitor"/> - <echo message="Building module tomcatint/tomcat5/bundled..."/> - <ant dir="../tomcatint/tomcat5/bundled" target="netbeans"/> - </target> - - <target name="all-translatedfiles" depends="init"> - <echo message="Building module translatedfiles..."/> - <getdependsclusters name="dependsClusters" list="${nb.clusters.list}"/> - <antcall target="build-one-cluster-dependencies" inheritAll="false"> - <param - name="one.cluster.dependencies" - value="${dependsClusters}"/> - <param name="one.cluster.name" value="this-cluster"/> - </antcall> - <ant dir="../translatedfiles" target="netbeans"/> - </target> - - <target name="all-xtest" depends="init"> - <getdependsclusters name="dependsClusters" list="${clusters.list}"/> - <antcall target="build-one-cluster-dependencies" inheritAll="false"> - <param name="one.cluster.dependencies" value="${dependsClusters}"/> - <param name="one.cluster.name" value="this-cluster"/> - </antcall> - <ant dir="../xtest/nbjunit"/> - <echo message="Building module xtest..."/> - <ant dir="../xtest" antfile="build.xml" target="netbeans"/> - </target> - - <!-- this is project is not a netbeans module project, so we do a no-op - here. The code in appsrvbridge gets built by XXX --> - <target name="all-serverplugins/sun/appsrvbridge" depends="init"> - <echo message="Building module serverplugins/sun/appsrvbridge... NO-OP"/> - </target> - - <!-- build NBMs for selected modules --> - <target name="build-nbms" depends="init"> - <!-- It's good idea to call merge target before this one. - NbMerge.java can set property "modules" to the list of realy - built modules (excluding fixedmodules which must build everytime). --> - <mkdir dir="nbms" /> - <property name="nbm.target.dir" location="nbms" /> - <for-each startdir=".." target="nbm" locations="${allmodules}"/> - </target> - <target name="nbm"/><!-- dummy target --> - - <property name="jnlp.signjar.keystore" location="build/default.keystore" /> - <available property="jnlp.signjar.keystore.exists" file="${jnlp.signjar.keystore}" /> - <target name="jnlp-generate-keystore" depends="init" unless="jnlp.signjar.keystore.exists" > - <property name="jnlp.signjar.alias" value="jnlp" /> - <property name="jnlp.signjar.password" value="netbeans" /> - <property name="jnlp.signjar.vendor" value="CN=NetBeans, OU=NetBeans, O=netbeans.org, C=US" /> - - <mkdir dir="${jnlp.signjar.keystore}/../" /> - <echo message="Going to create default keystore in ${jnlp.signjar.keystore}" /> - <genkey - alias="${jnlp.signjar.alias}" - keystore="${jnlp.signjar.keystore}" - storepass="${jnlp.signjar.password}" - dname="${jnlp.signjar.vendor}" - /> - </target> - - <target name="build-jnlp" depends="init,jnlp-generate-keystore"> - <fail message="Property jnlp.codebase must be set to final location of your JNLP files!" unless="jnlp.codebase" /> - <property name="jnlp.dest.dir" location="build/jnlp" /> - <mkdir dir="${jnlp.dest.dir}" /> - <for-each startdir=".." target="jnlp" locations="${config.modules.jnlp}"/> - </target> - - <target name="set-config-to-javadoc" > - <property name="moduleconfig" value="javadoc" /> - </target> - - <!-- build javadoc for selected modules --> - <target name="build-javadoc" depends="set-config-to-javadoc,init" description="Builds Javadoc documentation for modules; on branches pass e.g. -Djavadoc.web.root=http://www.netbeans.org/download/release35/javadoc"> - <ant dir="." target="merge"> - <property name="modules" value="${modules}"/> - <property name="fixedmodules" value="${fixedmodules}"/> - <property name="merge.dependent.modules" value="true"/> - <property name="stop.when.broken.module" value="false"/> - </ant> - - <mkdir dir="build/ModulesExportedInterfaces" /> - <property name="export.interfaces" location="build/ModulesExportedInterfaces" /> - - <mkdir dir="build/APIChanges" /> - <property name="export.apichanges" location="build/APIChanges" /> - - <!-- build javadoc for supported APIs --> - <for-each startdir=".." target="javadoc" locations="${fixedmodules}"/> - <!-- build javadoc for unsupported APIs --> - <for-each startdir=".." target="javadoc" locations="${modules}"/> - - <antcall inheritall="true" inheritrefs="true" target="javadoc-generate-xml" /> - <antcall inheritall="true" inheritrefs="true" target="javadoc-generate-html" /> - <antcall inheritall="true" inheritrefs="true" target="javadoc-check-broken-links" /> - </target> - - <target name="javadoc-generate-xml" depends="set-config-to-javadoc,init" > - <echo file="build/APIChanges/header.gen" >&lt;?xml version="1.0" encoding="UTF-8"?&gt; - &lt;changes&gt; - </echo> - - <echo file="build/APIChanges/footer.gen" > - &lt;/changes&gt; - </echo> - - <concat destfile="${netbeans.javadoc.dir}/apichanges.xml" > - <fileset dir="build/APIChanges" includes="header.gen" /> - <fileset dir="build/APIChanges" includes="*" excludes="*.gen" /> - <fileset dir="build/APIChanges" includes="footer.gen" /> - </concat> - - - <echo file="build/ModulesExportedInterfaces/header.gen" >&lt;?xml version="1.0" encoding="UTF-8"?&gt; - &lt;apis&gt; - </echo> - - <echo file="build/ModulesExportedInterfaces/footer.gen" > - &lt;/apis&gt; - </echo> - - <concat destfile="${netbeans.javadoc.dir}/modules.xml" > - <fileset dir="build/ModulesExportedInterfaces" includes="header.gen" /> - <fileset dir="build/ModulesExportedInterfaces" includes="*" excludes="*.gen" /> - <fileset dir="build/ModulesExportedInterfaces" includes="footer.gen" /> - </concat> - - <taskdef - name="javadoc-index" - classpath="nbantext.jar" - classname="org.netbeans.nbbuild.JavadocIndex" - /> - - - <javadoc-index target="${netbeans.javadoc.dir}/allclasses.xml" > - <packageslist dir="${netbeans.javadoc.dir}" > - <include name="**/allclasses-noframe.html" /> - </packageslist> - </javadoc-index> - </target> - - - <target name="javadoc-generate-html" depends="set-config-to-javadoc,init" > - <tstamp> - <format property="modules-javadoc-date" pattern="d MMM yyyy" locale="en" /> - </tstamp> - - <style - in="${netbeans.javadoc.dir}/modules.xml" - out="${netbeans.javadoc.dir}/usecases.html" - style="javadoctools/export2usecases.xsl" - > - <param name="date" expression="${modules-javadoc-date}"/> - </style> - - <style - in="${netbeans.javadoc.dir}/apichanges.xml" - out="${netbeans.javadoc.dir}/apichanges.html" - style="javadoctools/export2apichanges.xsl" - > - <param name="date" expression="${modules-javadoc-date}"/> - <param name="changes-since-year" expression="${previous.release.year}"/> - <param name="changes-since-day" expression="${previous.release.day}"/> - <param name="changes-since-month" expression="${previous.release.month}"/> - <param name="include-introduction" expression="true" /> - </style> - - <copy file="javadoctools/netbeans.css" tofile="${netbeans.javadoc.dir}/netbeans.css" /> - <condition property="javadoc.style.sheet.exists" > - <available file="${netbeans.javadoc.dir}/org-openide-util/javadoc.css" /> - </condition> - - <fail unless="javadoc.style.sheet.exists" > - The org-openide-util/javadoc.css has to exist as we are refering to - it from to master module javadoc pages. If it does not anymore, update - the javadoctools/export*.xsl templates. - </fail> - - <style - in="${netbeans.javadoc.dir}/allclasses.xml" - out="${netbeans.javadoc.dir}/allclasses-frame.html" - style="javadoctools/export2allclasses.xsl" - > - </style> - - <style - in="${netbeans.javadoc.dir}/modules.xml" - out="${netbeans.javadoc.dir}/overview-frame.html" - style="javadoctools/export2allmodules.xsl" - > - <param name="date" expression="${modules-javadoc-date}"/> - </style> - - <style - in="${netbeans.javadoc.dir}/modules.xml" - out="${netbeans.javadoc.dir}/layers.html" - style="javadoctools/export2layer.xsl" - > - <param name="date" expression="${modules-javadoc-date}"/> - </style> - - <style - in="${netbeans.javadoc.dir}/modules.xml" - out="${netbeans.javadoc.dir}/overview-summary.html" - style="javadoctools/export2html.xsl" - > - <param name="date" expression="${modules-javadoc-date}"/> - </style> - - - <!-- at the end geneate the index.html so people know where to start --> - <echo file="${netbeans.javadoc.dir}/index.html" ><![CDATA[ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd"> -<HTML><HEAD><TITLE>NetBeans API Index</TITLE> -</HEAD> -<FRAMESET cols="20%,80%" title="" onLoad="top.loadFrames()"> -<FRAMESET rows="30%,70%" title="" onLoad="top.loadFrames()"> -<FRAME src="overview-frame.html" name="packageListFrame" title="All Modules"> -<FRAME src="allclasses-frame.html" name="packageFrame" title="All classes"> -</FRAMESET> -<FRAME src="overview-summary.html" name="classFrame" title="Module, package, class and interface descriptions" scrolling="yes"> -<NOFRAMES> -<H2>Frame Alert</H2> -<P> -This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client. -Link to<A HREF="overview-summary.html">Non-frame version.</A> -</NOFRAMES> -</FRAMESET> -</HTML> - ]]></echo> - - <replace dir="${netbeans.javadoc.dir}"> - <include name="*.html"/> - <replacefilter token="@JDK@" value="http://java.sun.com/j2se/1.4.2/docs/api"/> - <replacefilter token="http://root/" value="." /> - <replacefilter token="$${javadoc.web.root}" value="." /> - </replace> - - <echo message="Javadoc index has been generated to ${netbeans.javadoc.dir}/index.html" /> - </target> - - - <target name="javadoc-check-broken-links" depends="init" unless="javadoc.skip.brokenlinks.check" > - <taskdef name="checklinks" classname="org.netbeans.nbbuild.CheckLinks"> - <classpath> - <pathelement location="nbantext.jar"/> - </classpath> - </taskdef> - <checklinks basedir="${netbeans.javadoc.dir}" checkexternal="${javadoc.check.external.links}" checkspaces="false" failonerror="true" > - <include name="*/overview-summary.html"/> - <include name="*/apichanges.html"/> - <include name="*/architecture-summary.html"/> - <include name="*/**/package-summary.html"/> - <include name="*/**/doc-files/**/*.html"/> - <include name="*.html" /> - </checklinks> - </target> - - <target name="build-messaging" depends="init"> - <echo message="Starting a build for NetBeans (build ${buildnum}, config '${moduleconfig}') ..."/> - <echo message="Selected modules: ${modules}"/> - <echo message="OS: ${os.name} ${os.version} Locale: ${user.language}_${user.region}"/> - <echo message="Java: ${nbjdk.home}"/> - </target> - - <!-- Use of nbmerge target has the effect of automatically depending on all-X for every module. --> - <!-- It also runs deltree(dir=wherever) and copydir(src=../X/netbeans,dest=wherever) to create the IDE install. --> - - <target name="build-nozip" depends="clean-cluster-flags,build-clusters" description="Build the IDE but do not create a final ZIP file."> - <loadproperties srcFile="${clusters.list.file}" /> - - <loadproperties srcfile="${netbeans.dest.dir}/moduleCluster.properties" /> - - <mkdir dir="${netbeans.dest.dir}/bin" /> - <copy file="../ide/launcher/unix/netbeans" todir="${netbeans.dest.dir}/bin" /> - <chmod file="${netbeans.dest.dir}/bin/netbeans" perm="ugo+rx"/> - <copy file="../ide/launcher/windows/netbeans.exe" todir="${netbeans.dest.dir}/bin" /> - <copy file="../ide/launcher/windows/nb.exe" todir="${netbeans.dest.dir}/bin" /> - <copy file="../ide/launcher/os2/netbeans.cmd" todir="${netbeans.dest.dir}/bin" /> - <!-- if anybody knows better place for icons, let me know: jtulach@netbeans.org --> - <copy file="../ide/launcher/os2/nbos2icons.zip" todir="${netbeans.dest.dir}/${nb.cluster.nb.dir}/" /> - - <mkdir dir="${netbeans.dest.dir}/etc" /> - <copy file="../ide/launcher/netbeans.conf" todir="${netbeans.dest.dir}/etc" /> - - <echo message="${netbeans.dest.dir}/${nb.cluster.platform.dir}/lib/nbexec" /> - <fixcrlf eol="lf" srcdir="${netbeans.dest.dir}" > - <include name="etc/netbeans.conf" /> - <include name="bin/netbeans" /> - <include name="${nb.cluster.platform.dir}/lib/nbexec" /> - </fixcrlf> - <fixcrlf eol="crlf" srcdir="${netbeans.dest.dir}" > - <include name="bin/netbeans.cmd" /> - <include name="${nb.cluster.platform.dir}/lib/nbexec.cmd" /> - </fixcrlf> - - <echo file="${netbeans.dest.dir}/build_info">NetBeans dev build - ------------------ - Number: ${buildnumber} - Date: ${buildday} - Branding: - Branch: trunk - Tag: - </echo> - </target> - - <target name="build" depends="build-nozip" - description="Create a complete build including a ZIP distribution (but do not try it)."> - <delete file="NetBeans-${buildnum}.zip"/> - <delete file="NetBeans-${buildnum}-build-extra-data.zip"/> - - <property name="nb-extra-files" value="*.built,test/**,extra/**"/> - - <!-- package the zip file --> - <zip destfile="NetBeans-${buildnum}.zip" update="true" duplicate="preserve"> - <zipfileset file="${netbeans.dest.dir}/bin/netbeans" filemode="755" prefix="${netbeans.dest}/bin"/> - <zipfileset file="${netbeans.dest.dir}/${nb.cluster.platform.dir}/lib/nbexec" filemode="755" prefix="${netbeans.dest}/${nb.cluster.platform.dir}/lib"/> - <zipfileset dir="${netbeans.dest.dir}/${nb.cluster.ide.dir}/ant/bin" filemode="755" prefix="${netbeans.dest}/${nb.cluster.ide.dir}/ant/bin"> - <exclude name="*.bat"/> - <exclude name="*.cmd"/> - </zipfileset> - <zipfileset dir="${netbeans.dest.dir}" filemode="755" prefix="${netbeans.dest}"> - <include name="**/*.sh"/> - </zipfileset> - <zipfileset dir="${netbeans.dest.dir}" prefix="${netbeans.dest}" excludes="${nb-extra-files}"> - <!-- XXX exclude the temporary cluster for parts of openide --> - <exclude name="tmp" /> - <exclude name="tmp/**/*" /> - </zipfileset> - </zip> - - <!-- package the zip file with extra files not to be included in regular product package--> - <!-- - <zip destfile="NetBeans-${buildnum}-build-extra-data.zip" update="true" duplicate="preserve"> - <zipfileset dir="${netbeans.dest.dir}" prefix="${netbeans.dest}" includes="${nb-extra-files}"/> - </zip> - --> - - <echo>Build created; see NetBeans-${buildnum}.zip (in nbbuild/). - If you like, you may run the IDE straight from - the ${netbeans.dest}/bin/ directory. - (For example, type: ant tryme) - </echo> - </target> - - <target name="delete-and-merge" depends="merge-delete,merge" /> - - <target name="merge-delete" depends="init"> - <delete dir="${netbeans.dest}" /> - </target> - - <target name="merge" depends="build-messaging"> - <mkdir dir="${netbeans.dest.dir}"/> - <nbmerge failonerror="${stop.when.broken.modules}" - dest="${netbeans.dest}" - topdir=".." - fixedmodules="${fixedmodules}" - modules="${modules}" - builtmodulesproperty="${built.modules.property}" - targetprefix="all-" - mergedependentmodules="${merge.dependent.modules}" > - </nbmerge> - <chmod perm="ugo+x"> - <fileset dir="${netbeans.dest.dir}"> - <include name="bin/netbeans"/> - <include name="bin/**/*.pl"/> - <include name="jakarta-tomcat-*/bin/*.sh"/> - </fileset> - </chmod> - </target> - - <target name="build-platform" depends="init"> - <run-depend-build clusters-to-build="nb.cluster.platform,nb.cluster.harness"/> - </target> - - <target name="build-cluster" depends="init"> - <run-depend-build clusters-to-build="${cluster-name}"/> - </target> - - <macrodef name="resolve"> - <attribute name="name"/> - <attribute name="value"/> - <sequential> - <property name="@{name}" value="${@{value}}"/> - </sequential> - </macrodef> - - <macrodef name="run-depend-build"> - <attribute name="clusters-to-build"/> - <sequential> - <echo>Repeat @{clusters-to-build}</echo> - <repeat target="build-one-cluster" name="one.cluster.name" values="@{clusters-to-build}" /> - </sequential> - </macrodef> - - <target name="build-clusters" depends="init"> - <run-depend-build clusters-to-build="${nb.clusters.list}"/> - </target> - - <target name="build-one-cluster-dependencies-check"> - <condition property="${one.cluster.name}-hasNoDependencies"> - <equals arg1="${one.cluster.dependencies}" arg2="" trim="true"/> - </condition> - <echo>Dependency prop :${one.cluster.name}-hasNoDependencies:</echo> - <echo>Cluster dep :${one.cluster.dependencies}:</echo> - <resolve name="test.prop" value="${one.cluster.name}-hasNoDependencies"/> - <echo>Cluster dep prp:${test.prop}:</echo> - </target> - - <target name="build-one-cluster-dependencies" - depends="build-one-cluster-dependencies-check" - unless="${one.cluster.name}-hasNoDependencies"> - <run-depend-build clusters-to-build="${one.cluster.dependencies}"/> - </target> - - <target name="build-one-cluster-check"> - <condition property="${one.cluster.name}-is-built"> - <available file="${netbeans.dest.dir}/${one.cluster.name}.built"/> - </condition> - <resolve name="test1.prop" value="${one.cluster.name}-is-built"/> - <echo>Cluster ${one.cluster.name} is :${test1.prop}:</echo> - </target> - - <target name="build-one-cluster" unless="${one.cluster.name}-is-built" depends="build-one-cluster-check"> - <echo message="Building ${one.cluster.name} modules"/> - <resolve name="one-cluster-modules" value="${one.cluster.name}"/> - <resolve name="one-cluster-dependencies" value="${one.cluster.name}.depends"/> - <echo>${one-cluster-modules}</echo> - <echo>Dependencies: ${one-cluster-dependencies}</echo> - <insert-module-all-targets/> <!-- we are in a subproject, so need to reinsert the targets... XXX <antcall> and thus <repeat> apparently reparses the Ant script from disk! --> - <antcall target="build-one-cluster-dependencies" inheritAll="false"> - <param name="one.cluster.dependencies" value="${one-cluster-dependencies}"/> - <param name="one.cluster.name" value="${one.cluster.name}"/> - </antcall> - <mkdir dir="${netbeans.dest.dir}"/> - <nbmerge failonerror="${stop.when.broken.modules}" - dest="${netbeans.dest.dir}" - topdir="${nb_all}" - fixedmodules="${one-cluster-modules}" - builtmodulesproperty="${built.modules.property}" - targetprefix="all-" - mergedependentmodules="false"> - </nbmerge> - <touch file="${netbeans.dest.dir}/${one.cluster.name}.built"/> - </target> - - <target name="zipclusters" depends="init"> - <mkdir dir="${netbeans.build.dir}/zips"/> - <repeat target="zip-one-cluster" name="one.cluster.name" values="${clusters.list}" /> - - <!-- package the misc files --> - <zip destfile="${netbeans.build.dir}/zips/${clusters.prefix}-misc-${buildnum}.zip" update="true" duplicate="preserve"> - <zipfileset dir="${netbeans.dest.dir}" filemode="755"> - <include name="bin/netbeans"/> - </zipfileset> - <zipfileset dir="${netbeans.dest.dir}"> - <include name="bin/**"/> - <include name="etc/**/"/> - </zipfileset> - </zip> - </target> - - <target name="zip-one-cluster"> - <taskdef name="setclusterpatternset" classname="org.netbeans.nbbuild.SetClusterPatternSet" classpath="nbantext.jar"/> - <taskdef name="setcluster" classname="org.netbeans.nbbuild.SetCluster" classpath="nbantext.jar"/> - <loadproperties srcFile="${clusters.list.file}" /> - <loadproperties srcFile="cluster-description.properties" /> - <setcluster cluster="${one.cluster.name}" name="one.cluster.dir" /> - - <setclusterpatternset cluster="${one.cluster.name}" name="${one.cluster.name}.files" trackingpath="${netbeans.dest.dir}" clusterdir="${one.cluster.dir}"/> - - <resolve name="zipcluster.file" value="${one.cluster.name}.pkg.filename"/> - <zip destfile="${netbeans.build.dir}/zips/${clusters.prefix}-${zipcluster.file}-${buildnum}.zip" update="true" duplicate="preserve"> - <zipfileset dir="${netbeans.dest.dir}" filemode="755"> - <include name="${one.cluster.dir}/lib/nbexec"/> - </zipfileset> - <zipfileset dir="${netbeans.dest.dir}" filemode="755"> - <include name="${one.cluster.dir}/ant/bin/*"/> - <exclude name="${one.cluster.dir}/ant/bin/*.bat"/> - <exclude name="${one.cluster.dir}/ant/bin/*.cmd"/> - </zipfileset> - <zipfileset dir="${netbeans.dest.dir}"> - <patternset refID="${one.cluster.name}.files"/> - </zipfileset> - </zip> - </target> - - <target name="create-rpms-proto"> - <mkdir dir="${netbeans.build.dir}/rpms"/> - <repeat target="create-one-rpm-proto" name="one.cluster.name" values="${clusters.list}" /> - </target> - - <target name="create-one-rpm-proto"> - <taskdef name="setcluster" classname="org.netbeans.nbbuild.SetCluster" classpath="nbantext.jar"/> - <loadproperties srcFile="cluster.properties" /> - <loadproperties srcFile="cluster-description.properties" /> - <setcluster cluster="${one.cluster.name}" name="one.cluster.dir" /> - <mkdir dir="${netbeans.build.dir}/rpms"/> - - <resolve name="pkg.name" value="${one.cluster.name}.pkg.name"/> - <resolve name="pkg.version" value="${one.cluster.name}.pkg.version"/> - <resolve name="pkg.desc" value="${one.cluster.name}.pkg.desc"/> - <resolve name="pkg.vendor" value="${one.cluster.name}.pkg.vendor"/> - <resolve name="pkg.email" value="${one.cluster.name}.pkg.email"/> - <resolve name="pkg.rpm.name" value="${one.cluster.name}.pkg.rpm.name"/> - <resolve name="pkg.rpm.requires" value="${one.cluster.name}.pkg.rpm.requires"/> - <resolve name="pkg.rpm.group" value="${one.cluster.name}.pkg.rpm.group"/> - <resolve name="pkg.rpm.url" value="${one.cluster.name}.pkg.rpm.url"/> - <resolve name="pkg.rpm.copyright" value="${one.cluster.name}.pkg.rpm.copyright"/> - <resolve name="pkg.rpm.map" value="${one.cluster.name}.pkg.rpm.map"/> - <resolve name="pkg.rpm.prefix" value="${one.cluster.name}.pkg.rpm.prefix"/> - - <echo file="${netbeans.build.dir}/rpms/${pkg.rpm.name}.spec"> - %define global_product_version ${pkg.version} - %define global_product_release 00 - %define _prefix ${pkg.rpm.prefix} - Version: %{global_product_version} - Release: %{global_product_release} - Group: ${pkg.rpm.group} - Copyright: ${pkg.rpm.copyright} - Vendor: ${pkg.vendor} - URL: ${pkg.rpm.url} - Prefix: %_prefix - AutoReqProv: no - Name: ${pkg.rpm.name} - Summary: ${pkg.name} - %description - ${pkg.desc} - - %files - - %erpm_map ${pkg.rpm.map} nb_destdir - - %dir ${pkg.rpm.map} - - ${pkg.rpm.map}/${one.cluster.dir}</echo> - </target> - - <target name="create-svr4s-proto"> - <mkdir dir="${netbeans.build.dir}/rpms"/> - <repeat target="create-one-svr4-proto" name="one.cluster.name" values="${clusters.list}" /> - </target> - - <target name="create-one-svr4-proto"> - <taskdef name="setcluster" classname="org.netbeans.nbbuild.SetCluster" classpath="nbantext.jar"/> - <loadproperties srcFile="cluster.properties" /> - <loadproperties srcFile="cluster-description.properties" /> - <setcluster cluster="${one.cluster.name}" name="one.cluster.dir" /> - <mkdir dir="${netbeans.build.dir}/svr4s"/> - - <resolve name="pkg.name" value="${one.cluster.name}.pkg.name"/> - <resolve name="pkg.version" value="${one.cluster.name}.pkg.version"/> - <resolve name="pkg.desc" value="${one.cluster.name}.pkg.desc"/> - <resolve name="pkg.vendor" value="${one.cluster.name}.pkg.vendor"/> - <resolve name="pkg.email" value="${one.cluster.name}.pkg.email"/> - <resolve name="pkg.svr4.pkg" value="${one.cluster.name}.pkg.svr4.pkg"/> - <resolve name="pkg.svr4.maxinst" value="${one.cluster.name}.pkg.svr4.maxinst"/> - <resolve name="pkg.svr4.sunw_pkgvers" value="${one.cluster.name}.pkg.svr4.sunw_pkgvers"/> - <resolve name="pkg.svr4.hotline" value="${one.cluster.name}.pkg.svr4.hotline"/> - <resolve name="pkg.svr4.classes" value="${one.cluster.name}.pkg.svr4.classes"/> - <resolve name="pkg.svr4.basedir" value="${one.cluster.name}.pkg.svr4.basedir"/> - <resolve name="pkg.svr4.pkginst" value="${one.cluster.name}.pkg.svr4.pkginst"/> - <resolve name="pkg.svr4.category" value="${one.cluster.name}.pkg.svr4.category"/> - <echo file="${netbeans.build.dir}/svr4s/${pkg.svr4.pkg}.spec"> - PKG=${pkg.svr4.pkg} - NAME=${pkg.name} - ARCH=sparc - VERSION=${pkg.version} - MAXINST=${pkg.svr4.maxinst} - CATEGORY=${pkg.svr4.category} - SUNW_PKGVERS=${pkg.svr4.sunw_pkgvers} - DESC=${pkg.desc} - VENDOR=${pkg.vendor} - HOTLINE=${pkg.svr4.hotline} - EMAIL=${pkg.email} - CLASSES=${pkg.svr4.classes} - BASEDIR=${pkg.svr4.basedir} - PKGINST=${pkg.svr4.pkginst}</echo> - </target> - - <target name="sanity-check" depends="testuserdir-delete,sanity-start" description="Test whether the build can start up without problems."/> - <target name="-testuserdir-delete-init" depends="init"> - <property name="test.user.dir.lock" location="${test.user.dir}/lock"/> - <available property="app.running" file="${test.user.dir.lock}"/> - </target> - <target name="-testuserdir-delete-ok" depends="-testuserdir-delete-init" unless="app.running"> - <delete dir="${test.user.dir}"/> - </target> - <target name="-testuserdir-delete-fail" depends="-testuserdir-delete-init" if="app.running"> - <!-- #66799: best to warn about this condition... --> - <fail>Will not delete ${test.user.dir} because ${test.user.dir.lock} still exists; kill any running process and delete lock file if necessary</fail> - </target> - <target name="testuserdir-delete" depends="-testuserdir-delete-ok,-testuserdir-delete-fail"/> - <target name="sanity-start" depends="init,maybe-build-nozip,-jdk-init"> - <mkdir dir="${test.user.dir}"/> - <echo>Starting the IDE as a sanity check...</echo> - <echo>WARNING - the sanity-start target is deprecated. Use commit-validation instead.</echo> - <!-- XXX better would be to scan start log for stacktraces and just show those; --> - <!-- possibly after filtering for duplicates or something like this. --> - <!-- Timeout is ten minutes; should be enough for valid start, while preventing --> - <!-- a deadlock from hanging an automated build: --> - <exec os="Windows NT Windows 95 Windows 98 Windows 2000 Windows 2003 Windows XP" executable="${netbeans.dest.abs}/bin/nb.exe" failonerror="yes" timeout="600000"> - <arg value="--jdkhome"/> - <arg file="${nbjdk.home}"/> - <arg value="--userdir"/> - <arg file="${test.user.dir}"/> - <arg line="${sanitystart.args}"/> - </exec> - <exec os="Linux SunOS Solaris Mac OS X" dir="." executable="sh" failonerror="yes" timeout="600000"> - <arg value="${netbeans.dest.abs}/bin/netbeans"/> - <arg value="--jdkhome"/> - <arg file="${nbjdk.home}"/> - <arg value="--userdir"/> - <arg file="${test.user.dir}"/> - <arg line="${sanitystart.args}"/> - </exec> - <echo>Finished starting the IDE, pay attention to any reported errors.</echo> - </target> - - <target name="check-for-build" > - <available property="have-build" file="${netbeans.dest.dir}/bin/netbeans"/> - </target> - <target name="maybe-build-nozip" depends="check-for-build" unless="have-build"> - <ant dir="${basedir}" target="build-nozip"/> - </target> - - <target name="nozip-check" - depends="build-nozip,sanity-check"> - <echo>WARNING - the nozip-check target is deprecated. Use all-nozip instead.</echo> - </target> - - <target name="tryme-setup-debug-args" if="debug.port" > - <property name="debug.pause" value="n" /> - <property name="debug.server" value="y" /> - - <property name="tryme.debug.args" value="-J-Xdebug -J-Xnoagent -J-Xrunjdwp:transport=dt_socket,suspend=${debug.pause},server=${debug.server},address=${debug.port}" /> - </target> - - <target name="tryme-debug" depends="-jdk-presetdef-nbjpdastart" description="Start IDE in debugger. May only be called from within IDE."> - <nbjpdastart name="NetBeans" addressproperty="debug.port" transport="dt_socket"> - <classpath> - <fileset dir="${netbeans.dest.dir}"> - <include name="**/*.jar"/> - </fileset> - </classpath> - </nbjpdastart> - <property name="debug.server" value="n"/> - <antcall target="tryme"/> - </target> - - <target name="tryme-profile" depends="-jdk-presetdef-nbprofiledirect" description="Start IDE in debugger. May only be called from within IDE."> - <property name="profiler.roots.path" value="profiler.roots.all" /> - <fileset id="profiler.roots.all" dir="${netbeans.dest.dir}"> - <include name="**/*.jar"/> - </fileset> - <nbprofiledirect - jvmargsprefix="-J" - jvmargsproperty="profiler.jvmargs" - mainclass="org.netbeans.Main" - > - <classpath> - <fileset dir="${netbeans.dest.dir}"> - <include name="**/*.jar"/> - </fileset> - </classpath> - <rootspath> - <fileset refid="${profiler.roots.path}" /> - </rootspath> - </nbprofiledirect> - - <antcall target="tryme"> - <param name="tryme.args" value="${profiler.jvmargs}"/> - </antcall> - </target> - - <target name="tryme" depends="init,maybe-build-nozip,tryme-setup-debug-args,-jdk-init" - description="Try running the IDE interactively (build it first if needed). - It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in debug mode" - > - <property name="tryme.debug.args" value="" /> - - <exec os="Windows NT Windows 95 Windows 98 Windows 2000 Windows 2003 Windows XP" executable="${netbeans.dest.abs}/bin/nb.exe" failonerror="yes"> - <arg value="--jdkhome"/> - <arg file="${nbjdk.home}"/> - <arg value="--userdir"/> - <arg file="${test.user.dir}"/> - <arg line="${tryme.args}"/> - <arg line="${tryme.debug.args}" /> - </exec> - <exec os="Linux SunOS Solaris Mac OS X" dir="." executable="sh" failonerror="yes"> - <arg value="${netbeans.dest}/bin/netbeans"/> - <arg value="--jdkhome"/> - <arg file="${nbjdk.home}"/> - <arg value="--userdir"/> - <arg file="${test.user.dir}"/> - <arg line="${tryme.args}"/> - <arg line="${tryme.debug.args}" /> - </exec> - </target> - - <target name="l10n-kit" depends="init"> - <taskdef name="l10n" classname="org.netbeans.nbbuild.L10nTask" - classpath="nbantext.jar"/> - <delete dir="${l10n.dist.dir}"/> - <mkdir dir="${l10n.dist.dir}"/> - <delete dir="tmp"/> - <mkdir dir="tmp"/> - <property name="nbroot" location=".."/> - <l10n topdirs="${nbroot}" modules="${fixedmodules},${modules}" - localizablefile="l10n.list" generatedfile="l10n.list.translated" - distdir="${l10n.dist.dir}" changedfile="l10n.list.changed" - builddir="tmp" buildnumber="${buildnumber}" - excludepattern="**/ja/,**/*_ja.*"/> - <delete dir="tmp"/> - </target> - - <target name="bootstrap-javadoc" - depends="bootstrap" - description="Generate Javadoc for Ant extensions."> - <!-- XXX this ought to be deleted at some point. --> - <!-- Can be done anyway by apisupport/ant, and published as regular module Javadoc --> - <!-- by the regular daily Javadoc build process. --> - <!-- Then all of this stuff can be deleted from the www part of CVS. --> - <mkdir dir="www/nbantext-javadoc"/> - <delete> - <fileset dir="www/nbantext-javadoc"> - <include name="**/*.html"/> - </fileset> - </delete> - <tstamp/> - <javadoc sourcepath="antsrc" - destdir="www/nbantext-javadoc" - packagenames="org.netbeans.nbbuild.*" - windowtitle="NetBeans Ant Extensions" - doctitle="Extended Ant Tasks for Building NetBeans" - nodeprecatedlist="true" - notree="true" - noindex="true" - nohelp="true" - nonavbar="true" - author="false" - version="false" - bottom="Built on ${buildday}" - > - <classpath refid="bootstrap-cp"/> - <link href="http://nagoya.apache.org/gump/javadoc/ant/build/javadocs" offline="true" packagelistloc="antsrc"/> - </javadoc> - </target> - - <target name="clean-external"> - <subant target="clean"> - <fileset dir=".."> - <include name="*/external/build.xml"/> - <include name="contrib/*/external/build.xml"/> - </fileset> - </subant> - </target> - - <target name="real-clean" depends="clean,clean-external" - description="Clean everything possible."> - <echo message="Cleaning old builds..."/> - <delete> - <fileset dir="."> - <include name="NetBeans-*.log"/> - <include name="NetBeans-*.zip"/> - </fileset> - </delete> - <!-- This step must be last: --> - <echo message="Cleaning NetBeans-specific Ant extensions..."/> - <delete file="nbantext.jar" quiet="true"/> - <delete dir="build/antclasses"/> - </target> - - <target name="ant-clean"> - <delete file="nbantext.jar"/> - </target> - - <target name="clean-cluster-flags" unless="do-not-rebuild-clusters"> - <mkdir dir="${netbeans.dest.dir}"/> - <delete includeEmptyDirs="true"> - <fileset dir="${netbeans.dest.dir}"> - <include name="*.built"/> - </fileset> - </delete> - </target> - - <target name="localclean" depends="clean-cluster-flags,init"> - <delete dir="${test.user.dir}"/> - <delete dir="build"/> - <delete file="moduledefs-tmp.properties"/> - <delete dir="nbms" /> - <delete dir="${netbeans.dest.dir}"/> - </target> - - <!-- more correct but takes too long: <target name="localtest" depends="bootstrap,all-xtest/nbjunit" > --> - <target name="localtest" depends="bootstrap"> - <ant dir="test" target="cleanresults"/> - <ant dir="test" target="runtests"/> - </target> - <target name="localtest-nb" depends="localtest"> - <nbbrowse file="test/results/index.html"/> - </target> - <target name="localtest-single-nb" depends="bootstrap"> - <property name="unit.test.base" location="test/unit/src"/> - <pathconvert property="xtest.includes" pathsep=","> - <path path="${includes}"/> - <mapper type="glob" from="${unit.test.base}${file.separator}*.java" to="*.class"/> - </pathconvert> - <property name="xtest.attribs" value="empty"/> - <ant dir="test" target="cleanresults"/> - <ant dir="test" target="runtests"/> - <nbbrowse file="test/results/index.html"/> - </target> - <target name="localtest-single-nb-debug" depends="bootstrap,-jdk-presetdef-nbjpdastart"> - <property name="unit.test.base" location="test/unit/src"/> - <pathconvert property="xtest.includes" pathsep=","> - <path path="${includes}"/> - <mapper type="glob" from="${unit.test.base}${file.separator}*.java" to="*.class"/> - </pathconvert> - <property name="xtest.attribs" value="empty"/> - <ant dir="test" target="cleanresults"/> - <nbjpdastart transport="dt_socket" addressproperty="jpda.address" name="${test.class}"> - <classpath> - <!-- - <path location="test/work/sys/tests/unit/classes"/> - <path location="test/work/sys/tests/"/> - <path location="test/unit/src/"/> - --> - <path location="nbantext.jar"/> - </classpath> - </nbjpdastart> - <ant dir="test" target="runtests"> - <property name="xtest.debug.address" value="${jpda.address}" /> - <property name="xtest.debug.pause" value="false" /> - </ant> - <nbbrowse file="test/results/index.html"/> - </target> - - <target name="cleanall" depends="init"> - <cleanall topdir=".." - modules="${allmodules}" - targetname="clean" - resolvedependencies="${resolve.clean.dependencies}" - deptargetprefix="all-" - failonerror="${stop.when.clean.error}" /> - </target> - - <target name="clean" depends="init,cleanall,localclean" - description="Clean out (almost) all build products."> - <echo message="Run `ant real-clean' if desired."/> - </target> - - <!-- This section contains properties and targets used to build --> - <!-- Solaris packages. --> - - <property name="solpkg-pkgproto" value="pkgproto"/> - <property name="solpkg-pkgmk" value="pkgmk"/> - <property name="solpkg-proto-file" value="prototype"/> - <property name="solpkg-actual-dir" value="to-be-specified"/> - <property name="solpkg-pkg-dir" value="to-be-specified"/> - <property name="solpkg-pkg-dest-dir" value="to-be-specified"/> - - <!-- You can run this target to create the prototype file and create --> - <!-- the package, or if you need to modify the prototype file before --> - <!-- building the package, you can run the two subtargets --> - <!-- separately. --> - <target name="solpkg-build" depends="solpkg-pkgproto,solpkg-pkgmk" - description="Generate a prototype file and create a Solaris package."/> - - <!-- This creates the pkg prototype file for a given directory and --> - <!-- its files. --> - <target name="solpkg-pkgproto" - description="Generate a prototype file."> - <exec executable="rm" failonerror="yes"> - <arg value="-rf"/> - <arg value="${solpkg-proto-file}"/> - </exec> - <exec executable="${solpkg-pkgproto}" output="${solpkg-proto-file}" - failonerror="yes"> - <arg value="${solpkg-actual-dir}=${solpkg-pkg-dir}"/> - </exec> - </target> - - <!-- This creates the Solaris pkg for a given prototype file, pkginfo --> - <!-- file, and directory. --> - <target name="solpkg-pkgmk" - description="Create a Solaris package."> - <exec executable="${solpkg-pkgmk}" failonerror="yes"> - <arg value="-o"/> - <arg value="-f"/> - <arg value="${solpkg-proto-file}"/> - <arg value="-r"/> - <arg value="${solpkg-actual-dir}"/> - <arg value="-d"/> - <arg value="${solpkg-pkg-dest-dir}"/> - </exec> - </target> - - <!-- End of Solaris package section. --> - - - <!-- Localized builds --> - <target name="all-dutch" depends="set-dutch-locale,all"/> - <target name="all-russian" depends="set-russian-locale,all"/> - <target name="all-french" depends="set-french-locale,all"/> - <target name="all-ja-zh" depends="set-ja-zh_CN-locales,all"/> - - <target name="set-ja-zh_CN-locales"> - <property name="locales" value="ja,zh_CN"/> - <property name="locjar.locales" value="${locales}"/> - <property name="locmakenbm.locales" value="${locales}"/> - <property name="locjhindexer.locales" value="${locales}"/> - <property name="localized.build.locales" value="${locales}"/> - </target> - - <target name="set-dutch-locale"> - <property name="locales" value="nl"/> - <property name="locjar.locales" value="${locales}"/> - <property name="locmakenbm.locales" value="${locales}"/> - <property name="locjhindexer.locales" value="${locales}"/> - <property name="localized.build.locales" value="${locales}"/> - </target> - - <target name="set-russian-locale"> - <property name="locales" value="ru"/> - <property name="locjar.locales" value="${locales}"/> - <property name="locmakenbm.locales" value="${locales}"/> - <property name="locjhindexer.locales" value="${locales}"/> - <property name="localized.build.locales" value="${locales}"/> - </target> - - <target name="set-french-locale"> - <property name="locales" value="fr"/> - <property name="locjar.locales" value="${locales}"/> - <property name="locmakenbm.locales" value="${locales}"/> - <property name="locjhindexer.locales" value="${locales}"/> - <property name="localized.build.locales" value="${locales}"/> - </target> - - <!-- end of localized builds --> - - - <target name="print-selected-modules" depends="init" description="Prints list of modules to build in selected moduleconfig."> - <echo message="modules=${allmodules}"/> - </target> - - <target name="print-cvs-modules" depends="init" description="Prints list of cvs modules required to build in selected moduleconfig."> - <taskdef name="printcvsmodules" classname="org.netbeans.nbbuild.PrintCvsModules" classpath="nbantext.jar"/> - <printcvsmodules modules="${fixedmodules},${modules}" targetprefix="all-" /> - </target> - - <target name="check-commit-validation"> - <condition property="run.validation" > - <and> - <available file="../ide/test/build.xml" /> - <available file="../jemmy/build.xml" /> - <available file="../jellytools/build.xml" /> - <available file="../xtest/build.xml" /> - <or> - <not> - <isset property="nb.run.validation"/> - </not> - <istrue value="${nb.run.validation}"/> - </or> - </and> - </condition> - </target> - - <target - name="unit-validation" - description="Invokes all existing unit tests in all IDE modules. - Useful when one wants to deeply verify that his changes - work" - > - <ant dir="../xtest/instance" target="runtests" > - <property name="xtest.config" value="unit-nb" /> - </ant> - </target> - - <target - name="commit-validation" - depends="commit-verification,commitValidation,no-commit-validation" - description="Runs tests to validate IDE before commit." - /> - - <target name="all-commitValidation" description="dummy target for build error recognition facility"/> - - <target - name="commit-verification" - description="Compares result of a build with golden files verifying various aspects of the exported interfaces" - depends=" - all-verification, - check-files-layout, - check-public-packages, - check-friend-packages, - check-shared-packages, - check-modules, - check-dependencies, - check-implementation-dependencies, - check-cluster-dependencies, - check-cluster-implementation-dependencies, - check-clusters-content" - /> - - <!-- JST: One day also add - check-external-libraries - --> - - <target name="all-verification" > - <echo message="Runs verification tests to check the IDE before commit" /> - </target> - - <!-- keep this target name at least for a while for backward compat -jglick --> - <target name="commitValidation" depends="all-commitValidation,check-commit-validation" if="run.validation"> - <property name="xtest.home" location="../xtest"/> - <ant dir="${xtest.home}/instance" target="cleanresults"> - <property name="xtest.config" value="commit-validation-nb"/> - </ant> - <ant dir="${xtest.home}/instance" target="cleantests"> - <property name="xtest.config" value="commit-validation-nb"/> - </ant> - <ant dir="${xtest.home}/instance" target="runtests"> - <property name="xtest.config" value="commit-validation-nb"/> - <property name="xtest.fail.on.failure" value="true"/> - </ant> - </target> - - <target name="no-commit-validation" depends="check-commit-validation" unless="run.validation"> - <echo> - *** WARNING *** - You do not seem to have the modules needed to run the commit validation test suite. - You may not commit any changes into the CVS repository without running these tests. - For more information: http://www.netbeans.org/community/guidelines/commit.html - </echo> - </target> - - <target name="sanity-build-from-source-pkg" depends="build-source"> - <available file="${netbeans.build.dir}/${cluster.name}-src-${buildnum}.zip" - property="pkg.available"/> - <fail message="Source package ${netbeans.build.dir}/${cluster.name}-src-${buildnum}.zip not available" unless="pkg.available"/> - <delete dir="testbuild"/> - <mkdir dir="testbuild"/> - <unzip dest="testbuild" src="${netbeans.build.dir}/${cluster.name}-src-${buildnum}.zip"/> - <property name="one.cluster.name" value="${cluster.name}"/> - <propertyset id="sanity-build"> - <propertyref name="one.cluster.name"/> - </propertyset> - <echoproperties destfile="testbuild/nbbuild/user.properties"> - <propertyset refid="sanity-build"/> - </echoproperties> - - <!-- it should call build of the refered cluster and not just hardcoded platform --> - <ant antfile="testbuild/nbbuild/build.xml" inheritall="false" target="build-one-cluster"> - <property file="testbuild/nbbuild/user.properties"/> - </ant> - <delete dir="testbuild"/> - </target> - - <target name="build-source" - depends="init,set-buildnumber" - description="Packages sources needed to compile given by cluster.name (can be specified by -Dcluster.name=nb.cluster.platform" - if="cluster.name" - > - <property name="buildnum" value="dev-${buildnumber}"/> - <echo message="Packaging sources of ${cluster.name} modules"/> - <resolve name="cluster-modules" value="${cluster.name}"/> - <resolve name="harness-modules" value="nb.cluster.harness"/> - <mkdir dir="${netbeans.build.dir}"/> - <taskdef name="definefileset" classname="org.netbeans.nbbuild.PrintCvsModules" classpath="nbantext.jar"/> - <definefileset modules="${cluster-modules}" targetprefix="all-" id="source-modules" dir=".." /> - <definefileset modules="${cluster-modules}" targetprefix="all-" id="external-modules" dir=".." mode="binaries" /> - <definefileset modules="${harness-modules}" targetprefix="all-" id="harness-source-modules" dir=".." /> - <definefileset modules="${harness-modules}" targetprefix="all-" id="harness-external-modules" dir=".." mode="binaries" /> - <zip zipfile="${netbeans.build.dir}/${cluster.name}-src-${buildnum}.zip" duplicate="preserve"> - <fileset refid="source-modules" /> - <fileset refid="external-modules" /> - <fileset refid="harness-source-modules" /> - <fileset refid="harness-external-modules" /> - </zip> - </target> - - <target name="generate-golden-files-init" depends="init,bootstrap" > - <property name="template.files.dir" location="build/golden" /> - <property name="golden.files.dir" location="../ide/golden" /> - <condition property="golden.files.eol" value="unix" > - <or> - <os family="unix" /> - <os family="mac" /> - </or> - </condition> - <property name="golden.files.eol" value="dos" /> - - <mkdir dir="${template.files.dir}" /> - - <!-- convert the golden files into platform default encoding --> - <fixcrlf srcdir="${golden.files.dir}" destdir="${template.files.dir}" eol="${golden.files.eol}" > - <include name="*txt" /> - </fixcrlf> - - </target> - - - <target name="generate-golden-files" depends="generate-golden-files-init" > - <property name="generated.files.dir" location="build/generated" /> - <mkdir dir="${generated.files.dir}" /> - - <taskdef name="deps" classname="org.netbeans.nbbuild.ModuleDependencies" classpath="nbantext.jar"/> - - <deps> - <input name="platform" > - <jars dir="${netbeans.dest.dir}" > - <include name="${nb.cluster.platform.dir}/**/*.jar" /> - </jars> - </input> - <input name="ide" > - <jars dir="${netbeans.dest.dir}" > - <include name="${nb.cluster.ide.dir}/**/*.jar" /> - </jars> - </input> - <input name="j2ee" > - <jars dir="${netbeans.dest.dir}" > - <include name="${nb.cluster.j2ee.dir}/**/*.jar" /> - </jars> - </input> - <input name="nb" > - <jars dir="${netbeans.dest.dir}" > - <include name="${nb.cluster.nb.dir}/**/*.jar" /> - </jars> - </input> - <input name="harness" > - <jars dir="${netbeans.dest.dir}" > - <include name="${nb.cluster.harness.dir}/**/*.jar" /> - </jars> - </input> - - <output type="group-dependencies" file="${generated.files.dir}/cluster-deps.txt" /> - <output type="group-implementation-dependencies" file="${generated.files.dir}/cluster-impl-deps.txt" /> - <output type="modules" file="${generated.files.dir}/modules.txt" /> - <output type="dependencies" file="${generated.files.dir}/deps.txt" /> - <output type="implementation-dependencies" file="${generated.files.dir}/impl-deps.txt" /> - <output type="public-packages" file="${generated.files.dir}/public-packages.txt" /> - <output type="shared-packages" file="${generated.files.dir}/shared-packages.txt" /> - <output type="friend-packages" file="${generated.files.dir}/friend-packages.txt" /> - <output type="external-libraries" file="${generated.files.dir}/external-libraries.txt" /> - </deps> - </target> - - <target name="check-public-packages" depends="generate-golden-files" > - <property name="check.public.packages.golden" location="${golden.files.dir}/public-packages.txt" /> - <property name="check.public.packages.template" location="${template.files.dir}/public-packages.txt" /> - <property name="check.public.packages.generated" location="${generated.files.dir}/public-packages.txt" /> - - <condition property="check-public-packages-are-they-the-same" > - <filesmatch file1="${check.public.packages.template}" file2="${check.public.packages.generated}" /> - </condition> - - - <exec os="Linux SunOS Solaris " dir="." executable="diff" failonerror="no" timeout="60000" > - <arg value="-U"/> - <arg value="15"/> - <arg value="${check.public.packages.template}" /> - <arg value="${check.public.packages.generated}" /> - </exec> - - <fail unless="check-public-packages-are-they-the-same" >! - *** Public packages has changed! *** - - Differences were found while comparing file - ${check.public.packages.template} - with - ${check.public.packages.generated} - - This means that the set of public packages changed since the previously known one. - Some packages may have been added, some of them may have been removed - Either by changing manifest of a module or by adding or removing a class file - from a module package. - - - Changing the packages may or may not be ok. It means that an api of - whole product changes and as such it is subject to review. If you passed - your review and want to change the list of public packages, then please - update the golden file at - ${check.public.packages.golden} - and run the test once again. - - Read more about the Verification Framework: - http://openide.netbeans.org/proposals/arch/clusters.html#verify - - Look at for information about reviews: - http://openide.netbeans.org/tutorial/review-steps.html - - Check the page about APIs: - http://openide.netbeans.org/tutorial/api-design.html#api - </fail> - </target> - - <target name="check-friend-packages" depends="generate-golden-files" > - <property name="check.friend.packages.golden" location="${golden.files.dir}/friend-packages.txt" /> - <property name="check.friend.packages.template" location="${template.files.dir}/friend-packages.txt" /> - <property name="check.friend.packages.generated" location="${generated.files.dir}/friend-packages.txt" /> - - <condition property="check-friend-packages-are-they-the-same" > - <filesmatch file1="${check.friend.packages.template}" file2="${check.friend.packages.generated}" /> - </condition> - - - <exec os="Linux SunOS Solaris " dir="." executable="diff" failonerror="no" timeout="60000" > - <arg value="-U"/> - <arg value="15"/> - <arg value="${check.friend.packages.template}" /> - <arg value="${check.friend.packages.generated}" /> - </exec> - - <fail unless="check-friend-packages-are-they-the-same" >! - *** Friend packages has changed! *** - - Differences were found while comparing file - ${check.friend.packages.template} - with - ${check.friend.packages.generated} - - This means that the set of friend packages changed since the previously known one. - Some packages may have been added, some of them may have been removed - Either by changing manifest of a module or by adding or removing a class file - from a module package. - - - Changing the packages may or may not be ok. It means that an api of - whole product changes and as such it is subject to review. If you passed - your review and want to change the list of friend packages, then please - update the golden file at - ${check.friend.packages.golden} - and run the test once again. - - Read more about the Verification Framework: - http://openide.netbeans.org/proposals/arch/clusters.html#verify - - Look at for information about reviews: - http://openide.netbeans.org/tutorial/review-steps.html - - Check the page about APIs: - http://openide.netbeans.org/tutorial/api-design.html#api - </fail> - </target> - - <target name="check-shared-packages" depends="generate-golden-files,-jdk-init" unless="have-jdk-1.5" > - <property name="check.shared.packages.golden" location="${golden.files.dir}/shared-packages.txt" /> - <property name="check.shared.packages.template" location="${template.files.dir}/shared-packages.txt" /> - <property name="check.shared.packages.generated" location="${generated.files.dir}/shared-packages.txt" /> - - <condition property="check-shared-packages-are-they-the-same" > - <filesmatch file1="${check.shared.packages.template}" file2="${check.shared.packages.generated}" /> - </condition> - - - <exec os="Linux SunOS Solaris Mac OS X" dir="." executable="diff" failonerror="no" timeout="60000" > - <arg value="-U"/> - <arg value="15"/> - <arg value="${check.shared.packages.template}" /> - <arg value="${check.shared.packages.generated}" /> - </exec> - - <fail unless="check-shared-packages-are-they-the-same" >! - *** Shared packages has changed! *** - - Differences were found while comparing file - ${check.shared.packages.template} - with - ${check.shared.packages.generated} - - This means that the set of shared packages changed since the previously known one. - Some packages may have been added, some of them may have been removed - Either by changing manifest of a module or by adding or removing a class file - from a module package. - - - Removing shared packages is ok. Adding shared packages is silly, complicates - and slows down module system and startup of the application. Do not do that! - If you are removing a shared package please update - ${check.shared.packages.golden} - and run the test once again. - - Read more about the Verification Framework: - http://openide.netbeans.org/proposals/arch/clusters.html#verify - - Look at for information about reviews: - http://openide.netbeans.org/tutorial/review-steps.html - - Check the page about APIs: - http://openide.netbeans.org/tutorial/api-design.html#api - </fail> - </target> - - <target name="check-external-libraries" depends="generate-golden-files" > - <property name="check.external.libraries.golden" location="${golden.files.dir}/external-libraries.txt" /> - <property name="check.external.libraries.template" location="${template.files.dir}/external-libraries.txt" /> - <property name="check.external.libraries.generated" location="${generated.files.dir}/external-libraries.txt" /> - - <condition property="check-external-libraries-are-they-the-same" > - <filesmatch file1="${check.external.libraries.template}" file2="${check.external.libraries.generated}" /> - </condition> - - - <exec os="Linux SunOS Solaris Mac OS X" dir="." executable="diff" failonerror="no" timeout="60000" > - <arg value="-U"/> - <arg value="15"/> - <arg value="${check.external.libraries.template}" /> - <arg value="${check.external.libraries.generated}" /> - </exec> - - <fail unless="check-external-libraries-are-they-the-same" >! - *** List of external libraries has changed! *** - - Differences were found while comparing file - ${check.external.libraries.template} - with - ${check.external.libraries.generated} - - This means that the set of external libraries (JARs that are not NetBeans - modules or does not have NetBeans-Own-Library: true in manifest) has - changed since the previously known one. Some libraries may have been added, - some of them may have been removed, they MD5 checksum or size has been changed. - - Changing the external libraries is ok, but requires legal approval everytime - new version of a library is put into the product. If you have the approval - want to change the list of external libraries, then please - update the golden file at - ${check.external.libraries.golden} - and run the test once again. - - Read more about the Verification Framework: - http://openide.netbeans.org/proposals/arch/clusters.html#verify - - Look at for information about reviews: - http://openide.netbeans.org/tutorial/review-steps.html - - Check the page about APIs: - http://openide.netbeans.org/tutorial/api-design.html#api - </fail> - </target> - - <target name="check-modules" depends="generate-golden-files" > - <property name="check.modules.golden" location="${golden.files.dir}/modules.txt" /> - <property name="check.modules.template" location="${template.files.dir}/modules.txt" /> - <property name="check.modules.generated" location="${generated.files.dir}/modules.txt" /> - - <condition property="check-modules-are-they-the-same" > - <filesmatch file1="${check.modules.template}" file2="${check.modules.generated}" /> - </condition> - - - <exec os="Linux SunOS Solaris Mac OS X" dir="." executable="diff" failonerror="no" timeout="60000" > - <arg value="-U"/> - <arg value="15"/> - <arg value="${check.modules.template}" /> - <arg value="${check.modules.generated}" /> - </exec> - - <fail unless="check-modules-are-they-the-same" >! - *** List of modules has changed! *** - - Differences were found while comparing file - ${check.modules.template} - with - ${check.modules.generated} - - This means that the set of modules changed since the previously known one. - Adding or removing a module significatly affects the set of APIs the - product offers and as such is subject to review. If you passed - your review and want to change the list of modules, then please - update the golden file at - ${check.modules.golden} - and run the test once again. - - Read more about the Verification Framework: - http://openide.netbeans.org/proposals/arch/clusters.html#verify - - Look at for information about reviews: - http://openide.netbeans.org/tutorial/review-steps.html - - Check the page about APIs: - http://openide.netbeans.org/tutorial/api-design.html#api - </fail> - </target> - - <target name="check-dependencies" depends="generate-golden-files" > - <antcall target="check-dependencies-subroutine" > - <param name="check.dependencies.golden" location="${golden.files.dir}/deps.txt" /> - <param name="check.dependencies.template" location="${template.files.dir}/deps.txt" /> - <param name="check.dependencies.generated" location="${generated.files.dir}/deps.txt" /> - </antcall> - </target> - - <target name="check-implementation-dependencies" depends="generate-golden-files" > - <antcall target="check-dependencies-subroutine" > - <param name="check.dependencies.golden" location="${golden.files.dir}/impl-deps.txt" /> - <param name="check.dependencies.template" location="${template.files.dir}/impl-deps.txt" /> - <param name="check.dependencies.generated" location="${generated.files.dir}/impl-deps.txt" /> - </antcall> - </target> - - <target name="check-cluster-dependencies" depends="generate-golden-files" > - <antcall target="check-dependencies-subroutine" > - <param name="check.dependencies.golden" location="${golden.files.dir}/cluster-deps.txt" /> - <param name="check.dependencies.template" location="${template.files.dir}/cluster-deps.txt" /> - <param name="check.dependencies.generated" location="${generated.files.dir}/cluster-deps.txt" /> - </antcall> - </target> - - <target name="check-cluster-implementation-dependencies" depends="generate-golden-files" > - <antcall target="check-dependencies-subroutine" > - <param name="check.dependencies.golden" location="${golden.files.dir}/cluster-impl-deps.txt" /> - <param name="check.dependencies.template" location="${template.files.dir}/cluster-impl-deps.txt" /> - <param name="check.dependencies.generated" location="${generated.files.dir}/cluster-impl-deps.txt" /> - </antcall> - </target> - - <target name="check-dependencies-subroutine" > - <condition property="check-dependencies-are-they-the-same" > - <filesmatch file1="${check.dependencies.template}" file2="${check.dependencies.generated}" /> - </condition> - - - <exec os="Linux SunOS Solaris Mac OS X" dir="." executable="diff" failonerror="no" timeout="60000" > - <arg value="-U"/> - <arg value="15"/> - <arg value="${check.dependencies.template}" /> - <arg value="${check.dependencies.generated}" /> - </exec> - - <fail unless="check-dependencies-are-they-the-same" >! - *** List of dependencies has changed! *** - - Differences were found while comparing file - ${check.dependencies.template} - with - ${check.dependencies.generated} - - This means that the set of dependencies changed since the previously known one. - Adding a dependency can restrict the ways how a final product can be assembled - and as such it forms an important aspect of API and is subject to review. - If you passed your review or you are sure you want to change the - list of dependencies, then please update the golden file at - ${check.dependencies.golden} - and run the test once again. - - Read more about the Verification Framework: - http://openide.netbeans.org/proposals/arch/clusters.html#verify - - Look at for information about reviews: - http://openide.netbeans.org/tutorial/review-steps.html - - Check the page about APIs and dependencies being important: - http://openide.netbeans.org/tutorial/api-design.html#api - </fail> - </target> - - - <target name="generate-files-layout" depends="generate-golden-files-init" > - <property name="generated.files.dir" location="build/generated" /> - <mkdir dir="${generated.files.dir}" /> - - <property name="check.files.layout.golden" location="${golden.files.dir}/files-layout.txt" /> - <property name="check.files.layout.template" location="${template.files.dir}/files-layout.txt" /> - <property name="check.files.layout.generated" location="${generated.files.dir}/files-layout.txt" /> - - <property name="check-file-layout-root" location="${netbeans.dest.dir}" /> - <fileset id="check-file-layout" dir="${check-file-layout-root}" casesensitive="yes" > - <include name="platform*/**" /> - <include name="ide*/**" /> - <include name="enterprise*/**" /> - <include name="nb*/**" /> - <include name="harness*/**" /> - </fileset> - - <pathconvert property="check-file-layout" refid="check-file-layout" dirsep="/" pathsep="," > - <map from="${check-file-layout-root}${file.separator}" to="" /> - </pathconvert> - <mkdir dir="build/generated" /> - <echo message="${check-file-layout}${line.separator}" file="${check.files.layout.generated}" /> - <replace file="${check.files.layout.generated}" token="," value="${line.separator}" /> - <replace file="${check.files.layout.generated}" token="\" value="/" /> - <condition property="check-files-are-they-the-same" > - <filesmatch file1="${check.files.layout.template}" file2="${check.files.layout.generated}" /> - </condition> - - - </target> - - - <target name="check-files-layout" depends="generate-files-layout" > - <exec os="Linux SunOS Solaris Mac OS X" dir="." executable="diff" failonerror="no" timeout="60000" > - <arg value="-U"/> - <arg value="15"/> - <arg value="${check.files.layout.template}" /> - <arg value="${check.files.layout.generated}" /> - </exec> - - <fail unless="check-files-are-they-the-same" >! - *** Layout of files has changed! *** - - Differences were found while comparing file ${check.files.layout.generated} with - ${check.files.layout.template} - This means that the layout of files changed since the previously known one. - Some files may have been added, some of them may have been removed or renamed. - - Changing the layout may or may not be ok. If you are sure that you want to - change the layout of files, then update the golden file at - ${check.files.layout.golden} - and run the test once again. If you got this warning without intending - to change the layout of files, think twice whether your commit is really - correct and consider asking for a review first. - - Read more about the Verification Framework: - http://openide.netbeans.org/proposals/arch/clusters.html#verify - - Look at for information about reviews: - http://openide.netbeans.org/tutorial/review-steps.html - - Check the page about APIs and files layout being an API: - http://openide.netbeans.org/tutorial/api-design.html#api - </fail> - </target> - - <target name="check-clusters-content" depends="bootstrap,init-tasks"> - <taskdef name="checkcontent" classname="org.netbeans.nbbuild.CheckClustersContent" classpath="nbantext.jar"/> - <checkcontent clusters="${nb.clusters.list}" trackingPath="${netbeans.dest.dir}" kitDestDir="${netbeans.dest.dir}"> - <exclude name="extra/**"/> - <exclude name="testtools/**"/> - <exclude name="bin/**"/> - <exclude name="README.html"/> - <exclude name="CREDITS.html"/> - <exclude name="LICENSE.txt"/> - <exclude name="DISTRIBUTION.txt"/> - <exclude name="THIRDPARTYLICENSE.txt"/> - <exclude name="nb.cluster.*"/> - <exclude name="etc/netbeans.conf"/> - <exclude name="build_info"/> - <exclude name="module_tracking.xml"/> - <exclude name="moduleCluster.properties"/> - <exclude name="netbeans.css"/> - </checkcontent> - </target> - - <target name="check-module-configs" depends="bootstrap" description="Sanity-check build.properties and cluster.properties."> - <taskdef name="checkmoduleconfigs" classname="org.netbeans.nbbuild.CheckModuleConfigs" classpath="nbantext.jar"/> - <checkmoduleconfigs nbroot=".."/> - </target> - - <target name="display-l10n-list-matches" description="Show which files are actually matched by an l10n.list in some module."> - <property name="nbroot" location=".."/> - <input addproperty="module">Select a top-level module (e.g. "java") to display results for:</input> - <property name="listfile" location="${nbroot}/${module}/l10n.list"/> - <echo>${listfile}:1: Matches follow... (click on hyperlinks from IDE!)</echo> - <echo>(warning: 'exclude' directives not honored here yet)</echo><!-- XXX use filtersets or something to fix --> - <apply parallel="false" executable="sh"> - <arg value="-c"/> - <arg value="echo $0:1"/> - <fileset dir="${nbroot}" includesfile="${listfile}"/> - </apply> - </target> - - <target name="increment-spec-versions" depends="bootstrap,init-module-list" description="Increment all standard module specification versions. Pass -Dbranch=true if not on the trunk."> - <property name="branch" value="false"/> - <taskdef name="incrspecvers" classname="org.netbeans.nbbuild.IncrementSpecificationVersions" classpath="nbantext.jar"/> - <incrspecvers nbroot=".." modules="${allmodules}" branch="${branch}"/> - </target> - -</project> diff --git a/xml.text.obsolete90/test/unit/data/input/XMLFormatterTest/testReformat/web.xml b/xml.text.obsolete90/test/unit/data/input/XMLFormatterTest/testReformat/web.xml index 65c946790..cacd1dff6 100644 --- a/xml.text.obsolete90/test/unit/data/input/XMLFormatterTest/testReformat/web.xml +++ b/xml.text.obsolete90/test/unit/data/input/XMLFormatterTest/testReformat/web.xml @@ -1,5 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" diff --git a/xml.text.obsolete90/test/unit/src/org/netbeans/modules/xml/text/syntax/invalid.xml b/xml.text.obsolete90/test/unit/src/org/netbeans/modules/xml/text/syntax/invalid.xml index ae45b834c..5093417b3 100644 --- a/xml.text.obsolete90/test/unit/src/org/netbeans/modules/xml/text/syntax/invalid.xml +++ b/xml.text.obsolete90/test/unit/src/org/netbeans/modules/xml/text/syntax/invalid.xml @@ -1,4 +1,24 @@ <?xml version="1.0"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <root> < <A> diff --git a/xml.text.obsolete90/test/unit/src/org/netbeans/modules/xml/text/syntax/test.xml b/xml.text.obsolete90/test/unit/src/org/netbeans/modules/xml/text/syntax/test.xml index 50740e4b4..3d30c043a 100644 --- a/xml.text.obsolete90/test/unit/src/org/netbeans/modules/xml/text/syntax/test.xml +++ b/xml.text.obsolete90/test/unit/src/org/netbeans/modules/xml/text/syntax/test.xml @@ -1,4 +1,24 @@ <?xml version="1.0"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <company name="Sun Microsystems Inc."> <employee ssn="xxx-xx-xxxx" id="123" address="16 Network Circle" diff --git a/xml.text/test/unit/data/goldenfiles/org/netbeans/modules/xml/text/indent/XMLFormatterTest/testReformatSample1.pass b/xml.text/test/unit/data/goldenfiles/org/netbeans/modules/xml/text/indent/XMLFormatterTest/testReformatSample1.pass index 11e1b782d..46cdf9238 100644 --- a/xml.text/test/unit/data/goldenfiles/org/netbeans/modules/xml/text/indent/XMLFormatterTest/testReformatSample1.pass +++ b/xml.text/test/unit/data/goldenfiles/org/netbeans/modules/xml/text/indent/XMLFormatterTest/testReformatSample1.pass @@ -1,5 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" diff --git a/xml.text/test/unit/data/goldenfiles/org/netbeans/modules/xml/text/indent/XMLFormatterTest/testReformatSample2.pass b/xml.text/test/unit/data/goldenfiles/org/netbeans/modules/xml/text/indent/XMLFormatterTest/testReformatSample2.pass index a52e98334..e4d15eb41 100644 --- a/xml.text/test/unit/data/goldenfiles/org/netbeans/modules/xml/text/indent/XMLFormatterTest/testReformatSample2.pass +++ b/xml.text/test/unit/data/goldenfiles/org/netbeans/modules/xml/text/indent/XMLFormatterTest/testReformatSample2.pass @@ -1,21 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- -*- sgml-indent-step: 2 -*- --> <!-- -The contents of this file are subject to the terms of the Common Development -and Distribution License (the License). You may not use this file except in -compliance with the License. -You can obtain a copy of the License at http://www.netbeans.org/cddl.html -or http://www.netbeans.org/cddl.txt. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -When distributing Covered Code, include this CDDL Header Notice in each file -and include the License file at http://www.netbeans.org/cddl.txt. -If applicable, add the following below the CDDL Header, with the fields -enclosed by brackets [] replaced by your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -The Original Software is NetBeans. The Initial Developer of the Original -Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun -Microsystems, Inc. All Rights Reserved. --> <project name="nbbuild" default="all" basedir="."> diff --git a/xml.text/test/unit/data/input/XMLFormatterTest/testReformat/web.xml b/xml.text/test/unit/data/input/XMLFormatterTest/testReformat/web.xml index 65c946790..cacd1dff6 100644 --- a/xml.text/test/unit/data/input/XMLFormatterTest/testReformat/web.xml +++ b/xml.text/test/unit/data/input/XMLFormatterTest/testReformat/web.xml @@ -1,5 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/AbstractTestCase.java b/xml.text/test/unit/src/org/netbeans/modules/xml/text/AbstractTestCase.java index 98ba32855..037582e70 100644 --- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/AbstractTestCase.java +++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/AbstractTestCase.java @@ -114,20 +114,16 @@ protected XMLSyntaxSupport getSyntaxSupport(String path) throws Exception { /** * Converts expected result data into a string. See result*.txt files. */ - protected String getExpectedResultAsString(String resultFile) { + protected String getExpectedResultAsString(String resultFile) throws IOException { StringBuilder expectedResult = new StringBuilder(); - InputStream in = AbstractTestCase.class.getResourceAsStream(resultFile); - Scanner scanner = new Scanner(in); - try { - while(scanner.hasNextLine()) { - expectedResult.append(scanner.nextLine()); - } - } finally { - scanner.close(); - try { - in.close(); - } catch (IOException ex) { - //stupid catch + try (InputStream in = AbstractTestCase.class.getResourceAsStream(resultFile); + Scanner scanner = new Scanner(in)) { + while (scanner.hasNextLine()) { + String line = scanner.nextLine(); + if (!line.trim().startsWith("#")) { + expectedResult.append(line); + expectedResult.append("\n"); + } } } return expectedResult.toString(); diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/bracematch/XMLBraceMatcherTest.java b/xml.text/test/unit/src/org/netbeans/modules/xml/text/bracematch/XMLBraceMatcherTest.java index b8f03c9a7..d98821a6d 100644 --- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/bracematch/XMLBraceMatcherTest.java +++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/bracematch/XMLBraceMatcherTest.java @@ -72,88 +72,88 @@ public void testPI() throws Exception { public void testDeclaration() throws Exception { BaseDocument doc = getDocument("bracematch/test.xml"); //inside "<!DOCTYPE" - XMLBraceMatcher instance = new XMLBraceMatcher(doc, 44); + XMLBraceMatcher instance = new XMLBraceMatcher(doc, 866); int[] origin = instance.doFindOrigin(); - assert(origin[0] == 39 && origin[1] == 48); + assert(origin[0] == 861 && origin[1] == 870); int[] match = instance.doFindMatches(); - assert(match[0] == 78 && match[1] == 79); + assert(match[0] == 900 && match[1] == 901); //between "<!DOCTYPE" and ">" - instance = new XMLBraceMatcher(doc, 65); + instance = new XMLBraceMatcher(doc, 887); origin = instance.doFindOrigin(); assert(origin == null); match = instance.doFindMatches(); //in declaration end i.e. ">" - instance = new XMLBraceMatcher(doc, 79); + instance = new XMLBraceMatcher(doc, 901); origin = instance.doFindOrigin(); - assert(origin[0] == 78 && origin[1] == 79); + assert(origin[0] == 900 && origin[1] == 901); match = instance.doFindMatches(); - assert(match[0] == 39 && match[1] == 48); + assert(match[0] == 861 && match[1] == 870); } public void testComment() throws Exception { BaseDocument doc = getDocument("bracematch/test.xml"); //inside start of comment i.e "<!--" - XMLBraceMatcher instance = new XMLBraceMatcher(doc, 81); + XMLBraceMatcher instance = new XMLBraceMatcher(doc, 903); int[] origin = instance.doFindOrigin(); - assert(origin[0] == 80 && origin[1] == 84); + assert(origin[0] == 902 && origin[1] == 906); int[] match = instance.doFindMatches(); - assert(match[0] == 103 && match[1] == 106); + assert(match[0] == 925 && match[1] == 928); //somewhere between "<!--" and "-->" - instance = new XMLBraceMatcher(doc, 95); + instance = new XMLBraceMatcher(doc, 917); origin = instance.doFindOrigin(); assert(origin == null); match = instance.doFindMatches(); //inside "-->" - instance = new XMLBraceMatcher(doc, 105); + instance = new XMLBraceMatcher(doc, 927); origin = instance.doFindOrigin(); - assert(origin[0] == 103 && origin[1] == 106); + assert(origin[0] == 925 && origin[1] == 928); match = instance.doFindMatches(); - assert(match[0] == 80 && match[1] == 84); + assert(match[0] == 902 && match[1] == 906); } public void testTag1() throws Exception { BaseDocument doc = getDocument("bracematch/test.xml"); //inside start of root tag "<root" - XMLBraceMatcher instance = new XMLBraceMatcher(doc, 110); + XMLBraceMatcher instance = new XMLBraceMatcher(doc, 932); int[] origin = instance.doFindOrigin(); - assert(origin[0] == 107 && origin[1] == 126); + assert(origin[0] == 929 && origin[1] == 948); int[] match = instance.doFindMatches(); - assert(match[0] == 204 && match[1] == 211); + assert(match[0] == 1026 && match[1] == 1033); //somewhere between "<root" and ">" - instance = new XMLBraceMatcher(doc, 120); + instance = new XMLBraceMatcher(doc, 942); origin = instance.doFindOrigin(); - assert(origin[0] == 107 && origin[1] == 126); + assert(origin[0] == 929 && origin[1] == 948); match = instance.doFindMatches(); //inside "</root>" - instance = new XMLBraceMatcher(doc, 207); + instance = new XMLBraceMatcher(doc, 1029); origin = instance.doFindOrigin(); - assert(origin[0] == 204 && origin[1] == 211); + assert(origin[0] == 1026 && origin[1] == 1033); match = instance.doFindMatches(); - assert(match[0] == 107 && match[1] == 112); - assert(match[2] == 125 && match[3] == 126); + assert(match[0] == 929 && match[1] == 934); + assert(match[2] == 947 && match[3] == 948); } public void testTag2() throws Exception { BaseDocument doc = getDocument("bracematch/test.xml"); //just before > in "<root...>" - XMLBraceMatcher instance = new XMLBraceMatcher(doc, 125); + XMLBraceMatcher instance = new XMLBraceMatcher(doc, 947); int[] origin = instance.doFindOrigin(); - assert(origin[0] == 107 && origin[1] == 126); + assert(origin[0] == 929 && origin[1] == 948); int[] match = instance.doFindMatches(); - assert(match[0] == 204 && match[1] == 211); + assert(match[0] == 1026 && match[1] == 1033); //just before > in "</root...>" - instance = new XMLBraceMatcher(doc, 210); + instance = new XMLBraceMatcher(doc, 1032); origin = instance.doFindOrigin(); - assert(origin[0] == 204 && origin[1] == 211); + assert(origin[0] == 1026 && origin[1] == 1033); match = instance.doFindMatches(); - assert(match[0] == 107 && match[1] == 112); - assert(match[2] == 125 && match[3] == 126); + assert(match[0] == 929 && match[1] == 934); + assert(match[2] == 947 && match[3] == 948); } } diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/bracematch/test.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/bracematch/test.xml index 09ef08dff..478877d63 100644 --- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/bracematch/test.xml +++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/bracematch/test.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!DOCTYPE taglib PUBLIC "hello" "hello"> <!-- Hello World. diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/completion/ElementResultItemDocumentationTest.java b/xml.text/test/unit/src/org/netbeans/modules/xml/text/completion/ElementResultItemDocumentationTest.java index b3dffb6b3..05e770fb8 100644 --- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/completion/ElementResultItemDocumentationTest.java +++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/completion/ElementResultItemDocumentationTest.java @@ -199,7 +199,7 @@ public void testFileDocumentation() throws Exception { CompletionDocumentation file = doc.resolveLink(url.toString()); assertNotNull(file); assertEquals("URL must be openable in browser", url, file.getURL()); - assertTrue("Invalid content of the linked doc", file.getText().startsWith("This is an URL resource with <a href=")); + assertTrue("Invalid content of the linked doc", file.getText().contains("This is an URL resource with <a href=")); } /** @@ -283,7 +283,7 @@ public DescriptionSource resolveLink(String link) { assertNull("Must not be openable in browser", resolved.getURL()); // fwk is able to fetch contents assertTrue("Framework must fetch contents of linked URL", - resolved.getText().startsWith("Resource referenced by relative link")); + resolved.getText().contains("Resource referenced by relative link")); CompletionDocumentation parent = doc.resolveLink("customContent"); assertEquals(PLAIN_DESCRIPTION_TEXT, parent.getText()); diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/completion/parentDoc.html b/xml.text/test/unit/src/org/netbeans/modules/xml/text/completion/parentDoc.html index e34fbd2d8..90a539afc 100644 --- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/completion/parentDoc.html +++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/completion/parentDoc.html @@ -1 +1,21 @@ +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> Document in parent directory \ No newline at end of file diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/completion/res/docResource.html b/xml.text/test/unit/src/org/netbeans/modules/xml/text/completion/res/docResource.html index 617061967..94d1b84fd 100644 --- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/completion/res/docResource.html +++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/completion/res/docResource.html @@ -1,2 +1,22 @@ +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> This is an URL resource with <a href="relativeLink1.html">relative link</a> and <a href="http://www.seznam.cz">absolute link</a> diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/completion/res/relativeLink1.html b/xml.text/test/unit/src/org/netbeans/modules/xml/text/completion/res/relativeLink1.html index c9215a021..52648c746 100644 --- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/completion/res/relativeLink1.html +++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/completion/res/relativeLink1.html @@ -1 +1,21 @@ +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> Resource referenced by relative link \ No newline at end of file diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/dom/XMLSyntaxSupportTest.java b/xml.text/test/unit/src/org/netbeans/modules/xml/text/dom/XMLSyntaxSupportTest.java index d1c3f14de..bbfe81ca2 100644 --- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/dom/XMLSyntaxSupportTest.java +++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/dom/XMLSyntaxSupportTest.java @@ -39,8 +39,8 @@ public XMLSyntaxSupportTest(String testName) { public static Test suite() { TestSuite suite = new TestSuite(); -// suite.addTest(new XMLSyntaxSupportTest("testParseForeward")); -// suite.addTest(new XMLSyntaxSupportTest("testParseBackward")); + suite.addTest(new XMLSyntaxSupportTest("testParseForeward")); + suite.addTest(new XMLSyntaxSupportTest("testParseBackward")); suite.addTest(new XMLSyntaxSupportTest("testTokens")); return suite; } @@ -53,10 +53,10 @@ public void testParseForeward() throws Exception { SyntaxElement se = support.getElementChain(1); StringBuilder actualResult = new StringBuilder(); while( se != null) { - actualResult.append("Class: " + se.getClass().getSimpleName() + " Offset: " + se.getElementOffset() + " Length: "+ se.getElementLength()); + actualResult.append("Class: " + se.getClass().getSimpleName() + " Offset: " + se.getElementOffset() + " Length: "+ se.getElementLength() + "\n"); se = se.getNext(); } - assert(getExpectedResultAsString("dom/result1.txt").equals(actualResult.toString())); + assertEquals(getExpectedResultAsString("dom/result1.txt"), actualResult.toString()); } public void testParseBackward() throws Exception { @@ -65,20 +65,20 @@ public void testParseBackward() throws Exception { SyntaxElement se = support.getElementChain(doc.getLength()-1); StringBuilder actualResult = new StringBuilder(); while( se != null) { - actualResult.append("Class: " + se.getClass().getSimpleName() + " Offset: " + se.getElementOffset() + " Length: "+ se.getElementLength()); + actualResult.append("Class: " + se.getClass().getSimpleName() + " Offset: " + se.getElementOffset() + " Length: "+ se.getElementLength() + "\n"); se = se.getPrevious(); } - assert(getExpectedResultAsString("dom/result2.txt").equals(actualResult.toString())); + assertEquals(getExpectedResultAsString("dom/result2.txt"), actualResult.toString()); } public void testTokens() throws Exception { BaseDocument doc = getDocument("syntax/test.xml"); XMLSyntaxSupport support = XMLSyntaxSupport.getSyntaxSupport(doc); - Token token = support.getPreviousToken(30); + Token token = support.getPreviousToken(852); System.out.println("Token: " + token.id() + " Text: " + token.text()); - token = support.getPreviousToken(31); + token = support.getPreviousToken(852 + 1); System.out.println("Token: " + token.id() + " Text: " + token.text()); - token = support.getPreviousToken(32); + token = support.getPreviousToken(852 + 2); System.out.println("Token: " + token.id() + " Text: " + token.text()); } diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/dom/result1.txt b/xml.text/test/unit/src/org/netbeans/modules/xml/text/dom/result1.txt index 7e0368609..795d404f5 100644 --- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/dom/result1.txt +++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/dom/result1.txt @@ -1,18 +1,36 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. Class: ProcessingInstruction Offset: 0 Length: 21 -Class: Text Offset: 21 Length: 1 -Class: StartTag Offset: 22 Length: 38 -Class: Text Offset: 60 Length: 5 -Class: StartTag Offset: 65 Length: 103 -Class: Text Offset: 168 Length: 13 -Class: EndTag Offset: 181 Length: 11 -Class: Text Offset: 192 Length: 5 -Class: StartTag Offset: 197 Length: 10 -Class: CDATASection Offset: 207 Length: 37 -Class: EndTag Offset: 244 Length: 11 -Class: Text Offset: 255 Length: 5 -Class: Comment Offset: 260 Length: 40 -Class: Text Offset: 300 Length: 5 -Class: EmptyTag Offset: 305 Length: 11 -Class: Text Offset: 316 Length: 1 -Class: EndTag Offset: 317 Length: 10 -Class: Text Offset: 327 Length: 1 +Class: TextImpl Offset: 21 Length: 1 +Class: Comment Offset: 22 Length: 821 +Class: TextImpl Offset: 843 Length: 1 +Class: StartTag Offset: 844 Length: 38 +Class: TextImpl Offset: 882 Length: 5 +Class: StartTag Offset: 887 Length: 103 +Class: TextImpl Offset: 990 Length: 13 +Class: EndTag Offset: 1003 Length: 11 +Class: TextImpl Offset: 1014 Length: 5 +Class: StartTag Offset: 1019 Length: 10 +Class: CDATASection Offset: 1029 Length: 37 +Class: EndTag Offset: 1066 Length: 11 +Class: TextImpl Offset: 1077 Length: 5 +Class: Comment Offset: 1082 Length: 40 +Class: TextImpl Offset: 1122 Length: 5 +Class: EmptyTag Offset: 1127 Length: 11 +Class: TextImpl Offset: 1138 Length: 1 +Class: EndTag Offset: 1139 Length: 10 +Class: TextImpl Offset: 1149 Length: 2 diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/dom/result2.txt b/xml.text/test/unit/src/org/netbeans/modules/xml/text/dom/result2.txt index 46ee555b1..a1467ac2e 100644 --- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/dom/result2.txt +++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/dom/result2.txt @@ -1,18 +1,32 @@ -Class: Text Offset: 327 Length: 1 -Class: EndTag Offset: 317 Length: 10 -Class: Text Offset: 316 Length: 1 -Class: EmptyTag Offset: 305 Length: 11 -Class: Text Offset: 300 Length: 5 -Class: Comment Offset: 260 Length: 40 -Class: Text Offset: 255 Length: 5 -Class: EndTag Offset: 244 Length: 11 -Class: CDATASection Offset: 207 Length: 37 -Class: StartTag Offset: 197 Length: 10 -Class: Text Offset: 192 Length: 5 -Class: EndTag Offset: 181 Length: 11 -Class: Text Offset: 168 Length: 13 -Class: StartTag Offset: 65 Length: 103 -Class: Text Offset: 60 Length: 5 -Class: StartTag Offset: 22 Length: 38 -Class: Text Offset: 21 Length: 1 +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +Class: EndTag Offset: 1139 Length: 10 +Class: EmptyTag Offset: 1127 Length: 11 +Class: TextImpl Offset: 1122 Length: 5 +Class: Comment Offset: 1082 Length: 40 +Class: TextImpl Offset: 1077 Length: 5 +Class: EndTag Offset: 1066 Length: 11 +Class: CDATASection Offset: 1029 Length: 37 +Class: StartTag Offset: 1019 Length: 10 +Class: TextImpl Offset: 1014 Length: 5 +Class: EndTag Offset: 1003 Length: 11 +Class: TextImpl Offset: 990 Length: 13 +Class: StartTag Offset: 887 Length: 103 +Class: TextImpl Offset: 882 Length: 5 +Class: StartTag Offset: 844 Length: 38 +Class: Comment Offset: 22 Length: 821 Class: ProcessingInstruction Offset: 0 Length: 21 diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/1998stats.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/1998stats.xml index ffc426ceb..a93b56da3 100644 --- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/1998stats.xml +++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/1998stats.xml @@ -1,5 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <SEASON> <YEAR>1998</YEAR> diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/XMLLexerFormatterTest.java b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/XMLLexerFormatterTest.java index bbd7e0c7e..43017eef6 100644 --- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/XMLLexerFormatterTest.java +++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/XMLLexerFormatterTest.java @@ -86,7 +86,7 @@ public void testFormatSubsection() throws Exception { BaseDocument inputDoc = getDocument("indent/input_sub.xml"); //format a subsection of the inputDoc XMLLexerFormatter formatter = new XMLLexerFormatter(null); - LineDocument formattedDoc = formatter.doReformat(inputDoc, 72, 97); + LineDocument formattedDoc = formatter.doReformat(inputDoc, 893, 918); System.out.println(formattedDoc.getText(0, formattedDoc.getLength())); LineDocument outputDoc = getDocument("indent/output_sub.xml"); assertTrue (compare(formattedDoc, outputDoc)); @@ -126,7 +126,7 @@ public void testFormatSubsection1() throws Exception { BaseDocument inputDoc = getDocument("indent/input_sub1.xml"); //format a subsection of the inputDoc XMLLexerFormatter formatter = new XMLLexerFormatter(null); - LineDocument formattedDoc = formatter.doReformat(inputDoc, 46, 74); + LineDocument formattedDoc = formatter.doReformat(inputDoc, 868, 896); System.out.println(formattedDoc.getText(0, formattedDoc.getLength())); LineDocument outputDoc = getDocument("indent/output_sub1.xml"); assertTrue (compare(formattedDoc, outputDoc)); @@ -136,7 +136,7 @@ public void testFormatSubsection2() throws Exception { BaseDocument inputDoc = getDocument("indent/input_sub2.xml"); //format a subsection of the inputDoc XMLLexerFormatter formatter = new XMLLexerFormatter(null); - LineDocument formattedDoc = formatter.doReformat(inputDoc, 63, 80); + LineDocument formattedDoc = formatter.doReformat(inputDoc, 885, 899); System.out.println(formattedDoc.getText(0, formattedDoc.getLength())); LineDocument outputDoc = getDocument("indent/output_sub2.xml"); assertTrue (compare(formattedDoc, outputDoc)); @@ -169,8 +169,8 @@ public void testFormatSubsection_PreserveWhitespace() throws Exception { BaseDocument inputDoc = getDocument("indent/input_preserve.xml"); //format the inputDoc XMLLexerFormatter formatter = new XMLLexerFormatter(null); - System.out.println("SECTION:" + inputDoc.getText(91, 87)); - LineDocument formattedDoc = formatter.doReformat(inputDoc, 91, 91 + 87); + System.out.println("SECTION:" + inputDoc.getText(913, 87)); + LineDocument formattedDoc = formatter.doReformat(inputDoc, 913, 913 + 87); System.out.println(formattedDoc.getText(0, formattedDoc.getLength())); LineDocument outputDoc = getDocument("indent/output_preserve.xml"); assertTrue(compare(formattedDoc, outputDoc)); diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input.xml index 09514e256..5c94a6a77 100644 --- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input.xml +++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input.xml @@ -1,5 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> - +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- hello world --> <wrap> <root> diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input2.xsd b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input2.xsd index 74ccbbc63..1254fd5bf 100644 --- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input2.xsd +++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input2.xsd @@ -1,5 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://xml.netbeans.org/schema/Namespace2" xmlns:tns="http://xml.netbeans.org/schema/Namespace2" diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_attrsIndent.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_attrsIndent.xml index 5452540e5..6a4399d04 100644 --- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_attrsIndent.xml +++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_attrsIndent.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <root var1="not indented" var2="aligned with var1"> <child diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_breaksMixedContent.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_breaksMixedContent.xml index 31f3a2889..0cc53b7c8 100644 --- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_breaksMixedContent.xml +++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_breaksMixedContent.xml @@ -1,5 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <root> <para> This is one sentence. diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_cdataContent.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_cdataContent.xml index 2bd299e70..f02a0a54b 100644 --- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_cdataContent.xml +++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_cdataContent.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <root> <a> <b><![CDATA[some content diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_contentIndent.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_contentIndent.xml index f11c9ebcb..393e7a1ac 100644 --- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_contentIndent.xml +++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_contentIndent.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- hello world --> <wrap> diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_emptyComment.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_emptyComment.xml index 32aabeadc..a0ded8249 100644 --- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_emptyComment.xml +++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_emptyComment.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <root> <!-- diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_nestedSame.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_nestedSame.xml index 0e9440b07..10379c348 100644 --- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_nestedSame.xml +++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_nestedSame.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <root> <elem1> <elem1></elem1> diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_newlineInTags.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_newlineInTags.xml index fa928e1a4..23daf691a 100644 --- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_newlineInTags.xml +++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_newlineInTags.xml @@ -1,6 +1,26 @@ <?xml encoding="UTF8" ?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <root attribute1="val" > diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_preserve.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_preserve.xml index 258c41edf..c02165869 100644 --- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_preserve.xml +++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_preserve.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <root name="a" xml:space="preserve"> Keep this diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_processingXml.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_processingXml.xml index 29ed5233e..e05d02cf9 100644 --- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_processingXml.xml +++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_processingXml.xml @@ -1,6 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <root> </root> \ No newline at end of file diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_sub.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_sub.xml index b90b24d1f..37e9277e9 100644 --- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_sub.xml +++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_sub.xml @@ -1,7 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- bug#131223 --> <root> <a><b>hello world</b></a> -</root> +</root> \ No newline at end of file diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_sub1.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_sub1.xml index 98a437a1f..9ad2b09c1 100644 --- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_sub1.xml +++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_sub1.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <root> <test attr="replace"></test> <a/> diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_sub2.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_sub2.xml index 5c4ddeb8c..abd0e4dcb 100644 --- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_sub2.xml +++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_sub2.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <root> <a/> <test attr="replace"></test> diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_tagAtStatOfLine.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_tagAtStatOfLine.xml index 9060b2a2d..ab1148ccf 100644 --- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_tagAtStatOfLine.xml +++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_tagAtStatOfLine.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_withpreserve.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_withpreserve.xml index 5818ecdd5..7c017396d 100644 --- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_withpreserve.xml +++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/input_withpreserve.xml @@ -1,2 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <root><node><nest xml:space="preserve"><child>Do not format</child><child>And do not format this</child></nest><nest><child>Do format</child><child>And format this</child></nest></node></root> \ No newline at end of file diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output.xml index 463a0e6ba..1459ac272 100644 --- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output.xml +++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output.xml @@ -1,5 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> - +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- hello world --> <wrap> <root> diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output2.xsd b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output2.xsd index 3682accd1..a0d604459 100644 --- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output2.xsd +++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output2.xsd @@ -1,5 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://xml.netbeans.org/schema/Namespace2" xmlns:tns="http://xml.netbeans.org/schema/Namespace2" diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_attrsIndent.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_attrsIndent.xml index 71eea0d31..60b267056 100644 --- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_attrsIndent.xml +++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_attrsIndent.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <root var1="not indented" var2="aligned with var1"> <child diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_breaksMixedContent.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_breaksMixedContent.xml index 9e5252ae8..72ee208c8 100644 --- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_breaksMixedContent.xml +++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_breaksMixedContent.xml @@ -1,5 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <root> <para> This is one sentence. diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_cdataContent.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_cdataContent.xml index 053d3177c..df2c10fe0 100644 --- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_cdataContent.xml +++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_cdataContent.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <root> <a> <b><![CDATA[some content diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_contentIndent.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_contentIndent.xml index 0c22dce54..17daaf48c 100644 --- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_contentIndent.xml +++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_contentIndent.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- hello world --> <wrap> diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_emptyComment.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_emptyComment.xml index fc871c4b3..0a9ce9cdd 100644 --- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_emptyComment.xml +++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_emptyComment.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <root> <!-- diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_nestedSame.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_nestedSame.xml index 69e73dc1e..3fbe75a64 100644 --- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_nestedSame.xml +++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_nestedSame.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <root> <elem1> <elem1></elem1> diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_newlineInTags.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_newlineInTags.xml index 6be3aa1ac..8a6c2fcb5 100644 --- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_newlineInTags.xml +++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_newlineInTags.xml @@ -1,6 +1,26 @@ <?xml encoding="UTF8" ?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <root attribute1="val" > diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_preserve.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_preserve.xml index 387ca40ab..d1afa8474 100644 --- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_preserve.xml +++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_preserve.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <root name="a" xml:space="preserve"> Keep this @@ -9,4 +29,4 @@ is<nest xml:space="default"> </nest>, and this too -</root> +</root> \ No newline at end of file diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_processingXml.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_processingXml.xml index 5307ff458..122543bef 100644 --- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_processingXml.xml +++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_processingXml.xml @@ -1,6 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <root> </root> \ No newline at end of file diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_sub.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_sub.xml index d021f2e47..1df55add0 100644 --- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_sub.xml +++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_sub.xml @@ -1,9 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- bug#131223 --> <root> <a> <b>hello world</b> </a> -</root> +</root> \ No newline at end of file diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_sub1.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_sub1.xml index 720dad18b..8fccd7166 100644 --- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_sub1.xml +++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_sub1.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <root> <test attr="replace"></test> <a/> diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_sub2.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_sub2.xml index 5b0f5285c..07260ee3c 100644 --- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_sub2.xml +++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_sub2.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <root> <a/> <test attr="replace"></test> diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_tagAtStatOfLine.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_tagAtStatOfLine.xml index 17cf39968..ce2aafba5 100644 --- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_tagAtStatOfLine.xml +++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_tagAtStatOfLine.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_withpreserve.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_withpreserve.xml index 158eaa203..a433c86d1 100644 --- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_withpreserve.xml +++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/output_withpreserve.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <root> <node> <nest xml:space="preserve"><child>Do not format</child><child>And do not format this</child></nest> diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/syntax/invalid.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/syntax/invalid.xml index ae45b834c..5093417b3 100644 --- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/syntax/invalid.xml +++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/syntax/invalid.xml @@ -1,4 +1,24 @@ <?xml version="1.0"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <root> < <A> diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/syntax/test.xml b/xml.text/test/unit/src/org/netbeans/modules/xml/text/syntax/test.xml index 50740e4b4..3d30c043a 100644 --- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/syntax/test.xml +++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/syntax/test.xml @@ -1,4 +1,24 @@ <?xml version="1.0"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <company name="Sun Microsystems Inc."> <employee ssn="xxx-xx-xxxx" id="123" address="16 Network Circle" diff --git a/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/model/extensions/http/validation/Bundle.properties b/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/model/extensions/http/validation/Bundle.properties index d857424e7..fe371d50f 100644 --- a/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/model/extensions/http/validation/Bundle.properties +++ b/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/model/extensions/http/validation/Bundle.properties @@ -1,41 +1,19 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved. +# http://www.apache.org/licenses/LICENSE-2.0 # -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. -# -# Contributor(s): -# Package specific ResourceBundle properties file +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. HTTPBindingValidator.One_binding_allowed=Only one <http:binding> element is allowed per binding. HTTPBindingValidator.Verb_required=The <http:binding> element requires a verb attribute with a value of either "GET" or "POST". diff --git a/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/model/extensions/mime/validation/Bundle.properties b/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/model/extensions/mime/validation/Bundle.properties index 967df10e7..6638d5efa 100644 --- a/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/model/extensions/mime/validation/Bundle.properties +++ b/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/model/extensions/mime/validation/Bundle.properties @@ -1,41 +1,19 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved. +# http://www.apache.org/licenses/LICENSE-2.0 # -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. -# -# Contributor(s): -# Package specific ResourceBundle properties file +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. AP2901_INPUT=WS-I(AP2901): The <wsdl:input> uses neither the WSDL MIME Binding as described in WSDL 1.1 Section 5 nor WSDL SOAP binding as described in WSDL 1.1 Section 3. AP2901_OUTPUT=WS-I(AP2901): The <wsdl:output> uses neither the WSDL MIME Binding as described in WSDL 1.1 Section 5 nor WSDL SOAP binding as described in WSDL 1.1 Section 3. diff --git a/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/model/extensions/soap/validation/Bundle.properties b/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/model/extensions/soap/validation/Bundle.properties index 375a69094..9ff0c93b4 100644 --- a/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/model/extensions/soap/validation/Bundle.properties +++ b/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/model/extensions/soap/validation/Bundle.properties @@ -1,41 +1,19 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved. +# http://www.apache.org/licenses/LICENSE-2.0 # -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. -# -# Contributor(s): -# Package specific ResourceBundle properties file +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. SOAPBindingValidator.Transport_URI_required=Transport URI required on <soap:binding> element SOAPBindingValidator.Unsupported_transport=The <soap:binding> element only supports a transport URI of http://schemas.xmlsoap.org/soap/http. No other transport is currently supported. diff --git a/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/model/extensions/soap12/validation/Bundle.properties b/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/model/extensions/soap12/validation/Bundle.properties index 542b56438..59f4816ff 100644 --- a/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/model/extensions/soap12/validation/Bundle.properties +++ b/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/model/extensions/soap12/validation/Bundle.properties @@ -1,41 +1,19 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved. +# http://www.apache.org/licenses/LICENSE-2.0 # -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. -# -# Contributor(s): -# Package specific ResourceBundle properties file +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. SOAPBindingValidator.Transport_URI_required=Transport URI required on <soap:binding> element SOAPBindingValidator.Unsupported_transport=The <soap:binding> element only supports a transport URI of http://schemas.xmlsoap.org/soap/http OR http://www.w3.org/2003/05/soap/bindings/HTTP/. No other transport is currently supported. diff --git a/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/validator/resources/wsdl-2004-08-24.xsd b/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/validator/resources/wsdl-2004-08-24.xsd new file mode 100644 index 000000000..70c31ff34 --- /dev/null +++ b/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/validator/resources/wsdl-2004-08-24.xsd @@ -0,0 +1,306 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + +Copyright 2001 - 2005, International Business Machines Corporation and Microsoft Corporation +All Rights Reserved + +License for WSDL Schema Files + +The Authors grant permission to copy and distribute the WSDL Schema +Files in any medium without fee or royalty as long as this notice and +license are distributed with them. The originals of these files can +be located at: + +http://schemas.xmlsoap.org/wsdl/2004-08-24.xsd + +THESE SCHEMA FILES ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS +OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THESE FILES, INCLUDING, BUT NOT +LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, +NON-INFRINGEMENT OR TITLE. THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, +INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR +RELATING TO ANY USE OR DISTRIBUTION OF THESE FILES. + +The name and trademarks of the Authors may NOT be used in any manner, +including advertising or publicity pertaining to these files or any program +or service that uses these files, written prior permission. Title to copyright +in these files will at all times remain with the Authors. + +No other rights are granted by implication, estoppel or otherwise. + + +--> +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" + targetNamespace="http://schemas.xmlsoap.org/wsdl/" elementFormDefault="qualified"> + <xs:complexType mixed="true" name="tDocumentation"> + <xs:sequence> + <xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="tDocumented"> + <xs:annotation> + <xs:documentation> + This type is extended by component types to allow them to be documented + </xs:documentation> + </xs:annotation> + <xs:sequence> + <xs:element name="documentation" type="wsdl:tDocumentation" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + <!-- implemented resolution of swa124 --> + <xs:complexType name="tExtensibleAttributesDocumented" abstract="true"> + <xs:complexContent> + <xs:extension base="wsdl:tDocumented"> + <xs:annotation> + <xs:documentation> + This type is extended by component types to allow attributes from other namespaces to be added. + </xs:documentation> + </xs:annotation> + <xs:sequence> + <xs:any namespace="##other" minOccurs="0" + maxOccurs="unbounded" processContents="lax"/> + </xs:sequence> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <!-- implemented resolution of swa124 --> + <xs:complexType name="tExtensibleDocumented" abstract="true"> + <xs:complexContent> + <xs:extension base="wsdl:tDocumented"> + <xs:annotation> + <xs:documentation> + This type is extended by component types to allow elements from other namespaces to be added. + </xs:documentation> + </xs:annotation> + <xs:sequence> + <xs:any namespace="##other" minOccurs="0" + maxOccurs="unbounded" processContents="lax"/> + </xs:sequence> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:element name="definitions" type="wsdl:tDefinitions"> + <xs:key name="message"> + <xs:selector xpath="wsdl:message"/> + <xs:field xpath="@name"/> + </xs:key> + <xs:key name="portType"> + <xs:selector xpath="wsdl:portType"/> + <xs:field xpath="@name"/> + </xs:key> + <xs:key name="binding"> + <xs:selector xpath="wsdl:binding"/> + <xs:field xpath="@name"/> + </xs:key> + <xs:key name="service"> + <xs:selector xpath="wsdl:service"/> + <xs:field xpath="@name"/> + </xs:key> + <xs:key name="import"> + <xs:selector xpath="wsdl:import"/> + <xs:field xpath="@namespace"/> + </xs:key> + </xs:element> + <xs:group name="anyTopLevelOptionalElement"> + <xs:annotation> + <xs:documentation> + Any top level optional element allowed to appear more then once - any child of definitions element except wsdl:types. Any extensibility element is allowed in any place. + </xs:documentation> + </xs:annotation> + <xs:choice> + <xs:element name="import" type="wsdl:tImport"/> + <xs:element name="types" type="wsdl:tTypes"/> + <xs:element name="message" type="wsdl:tMessage"> + <xs:unique name="part"> + <xs:selector xpath="wsdl:part"/> + <xs:field xpath="@name"/> + </xs:unique> + </xs:element> + <xs:element name="portType" type="wsdl:tPortType"/> + <xs:element name="binding" type="wsdl:tBinding"/> + <xs:element name="service" type="wsdl:tService"> + <xs:unique name="port"> + <xs:selector xpath="wsdl:port"/> + <xs:field xpath="@name"/> + </xs:unique> + </xs:element> + </xs:choice> + </xs:group> + <!-- implemented resolution of er015 and UPA fix. ASK --> + <xs:complexType name="tDefinitions"> + <xs:complexContent> + <xs:extension base="wsdl:tExtensibleDocumented"> + <xs:sequence minOccurs="0"> + <xs:group ref="wsdl:anyTopLevelOptionalElement"/> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:group ref="wsdl:anyTopLevelOptionalElement"/> + <xs:any namespace="##other" processContents="lax"/> + </xs:choice> + </xs:sequence> + <xs:attribute name="targetNamespace" type="xs:anyURI" use="optional"/> + <xs:attribute name="name" type="xs:NCName" use="optional"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="tImport"> + <xs:complexContent> + <xs:extension base="wsdl:tExtensibleAttributesDocumented"> + <xs:attribute name="namespace" type="xs:anyURI" use="required"/> + <xs:attribute name="location" type="xs:anyURI" use="required"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="tTypes"> + <xs:complexContent> + <xs:extension base="wsdl:tExtensibleDocumented"/> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="tMessage"> + <xs:complexContent> + <xs:extension base="wsdl:tExtensibleDocumented"> + <xs:sequence> + <xs:element name="part" type="wsdl:tPart" + minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + <xs:attribute name="name" type="xs:NCName" use="required"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="tPart"> + <xs:complexContent> + <xs:extension base="wsdl:tExtensibleAttributesDocumented"> + <xs:attribute name="name" type="xs:NCName" use="required"/> + <xs:attribute name="element" type="xs:QName" use="optional"/> + <xs:attribute name="type" type="xs:QName" use="optional"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="tPortType"> + <xs:complexContent> + <xs:extension base="wsdl:tExtensibleAttributesDocumented"> + <xs:sequence> + <xs:element name="operation" type="wsdl:tOperation" + minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + <xs:attribute name="name" type="xs:NCName" use="required"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="tOperation"> + <xs:complexContent> + <xs:extension base="wsdl:tExtensibleDocumented"> + <xs:sequence> + <xs:choice> + <xs:group ref="wsdl:request-response-or-one-way-operation"/> + <xs:group ref="wsdl:solicit-response-or-notification-operation"/> + </xs:choice> + </xs:sequence> + <xs:attribute name="name" type="xs:NCName" use="required"/> + <xs:attribute name="parameterOrder" type="xs:NMTOKENS" use="optional"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:group name="request-response-or-one-way-operation"> + <xs:sequence> + <xs:element name="input" type="wsdl:tParam"/> + <xs:sequence minOccurs="0"> + <xs:element name="output" type="wsdl:tParam"/> + <xs:element name="fault" type="wsdl:tFault" + minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:sequence> + </xs:group> + <xs:group name="solicit-response-or-notification-operation"> + <xs:sequence> + <xs:element name="output" type="wsdl:tParam"/> + <xs:sequence minOccurs="0"> + <xs:element name="input" type="wsdl:tParam"/> + <xs:element name="fault" type="wsdl:tFault" + minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:sequence> + </xs:group> + <xs:complexType name="tParam"> + <xs:complexContent> + <xs:extension base="wsdl:tExtensibleAttributesDocumented"> + <xs:attribute name="name" type="xs:NCName" use="optional"/> + <xs:attribute name="message" type="xs:QName" use="required"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="tFault"> + <xs:complexContent> + <xs:extension base="wsdl:tExtensibleAttributesDocumented"> + <xs:attribute name="name" type="xs:NCName" use="required"/> + <xs:attribute name="message" type="xs:QName" use="required"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="tBinding"> + <xs:complexContent> + <xs:extension base="wsdl:tExtensibleDocumented"> + <xs:sequence> + <xs:element name="operation" + type="wsdl:tBindingOperation" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + <xs:attribute name="name" type="xs:NCName" use="required"/> + <xs:attribute name="type" type="xs:QName" use="required"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="tBindingOperationMessage"> + <xs:complexContent> + <xs:extension base="wsdl:tExtensibleDocumented"> + <xs:attribute name="name" type="xs:NCName" use="optional"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="tBindingOperationFault"> + <xs:complexContent> + <xs:extension base="wsdl:tExtensibleDocumented"> + <xs:attribute name="name" type="xs:NCName" use="required"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="tBindingOperation"> + <xs:complexContent> + <xs:extension base="wsdl:tExtensibleDocumented"> + <xs:sequence> + <xs:element name="input" + type="wsdl:tBindingOperationMessage" minOccurs="0"/> + <xs:element name="output" + type="wsdl:tBindingOperationMessage" minOccurs="0"/> + <xs:element name="fault" + type="wsdl:tBindingOperationFault" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + <xs:attribute name="name" type="xs:NCName" use="required"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="tService"> + <xs:complexContent> + <xs:extension base="wsdl:tExtensibleDocumented"> + <xs:sequence> + <xs:element name="port" type="wsdl:tPort" + minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + <xs:attribute name="name" type="xs:NCName" use="required"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="tPort"> + <xs:complexContent> + <xs:extension base="wsdl:tExtensibleDocumented"> + <xs:attribute name="name" type="xs:NCName" use="required"/> + <xs:attribute name="binding" type="xs:QName" use="required"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:attribute name="arrayType" type="xs:string"/> + <xs:attribute name="required" type="xs:boolean"/> + <xs:complexType name="tExtensibilityElement" abstract="true"> + <xs:attribute ref="wsdl:required" use="optional"/> + </xs:complexType> +</xs:schema> diff --git a/xml.wsdl.model/test/unit/src/org/netbeans/modules/xml/wsdl/model/ImportTest.java b/xml.wsdl.model/test/unit/src/org/netbeans/modules/xml/wsdl/model/ImportTest.java index 92dcfd1a4..4ff56bd19 100644 --- a/xml.wsdl.model/test/unit/src/org/netbeans/modules/xml/wsdl/model/ImportTest.java +++ b/xml.wsdl.model/test/unit/src/org/netbeans/modules/xml/wsdl/model/ImportTest.java @@ -126,20 +126,22 @@ public void testXsdTypeWithoutImport() throws Exception { assertEquals("string", gt.getName()); } - public void testImportSameNamespaceWsdl() throws Exception { - WSDLModel model = Util.loadWSDLModel("resources/GoogleFlow.wsdl"); - Operation op = model.findComponentByName("initiate", Operation.class); - Message referencedMessage = op.getInput().getMessage().get(); - assertEquals("Imported model has same namespace", model.getDefinitions().getTargetNamespace(), - referencedMessage.getModel().getDefinitions().getTargetNamespace()); - } +// Disabled as referenced files were partly not donated by oracle to apache +// public void testImportSameNamespaceWsdl() throws Exception { +// WSDLModel model = Util.loadWSDLModel("resources/GoogleFlow.wsdl"); +// Operation op = model.findComponentByName("initiate", Operation.class); +// Message referencedMessage = op.getInput().getMessage().get(); +// assertEquals("Imported model has same namespace", model.getDefinitions().getTargetNamespace(), +// referencedMessage.getModel().getDefinitions().getTargetNamespace()); +// } - public void testUnqualifiedSchemaReference() throws Exception { - WSDLModelImpl model = (WSDLModelImpl)Util.loadWSDLModel("resources/SiebelInterface.wsdl"); - String xpath = "/definitions/message[@name='SiebelInterfaceRequest']/part[@name='SWEExtData']"; - Part part = Util.find(Part.class, model, xpath); - assertNotNull("part.element should resolve w/o prefix", part.getElement().get()); - } +// Disabled as referenced files were partly not donated by oracle to apache +// public void testUnqualifiedSchemaReference() throws Exception { +// WSDLModelImpl model = (WSDLModelImpl)Util.loadWSDLModel("resources/SiebelInterface.wsdl"); +// String xpath = "/definitions/message[@name='SiebelInterfaceRequest']/part[@name='SWEExtData']"; +// Part part = Util.find(Part.class, model, xpath); +// assertNotNull("part.element should resolve w/o prefix", part.getElement().get()); +// } public void testReferenceToOtherEmbededSchema() throws Exception { WSDLModelImpl model = (WSDLModelImpl)Util.loadWSDLModel("resources/Sumador.wsdl"); diff --git a/xml.xam/apichanges.xml b/xml.xam/apichanges.xml index 5040d6269..f43409a32 100644 --- a/xml.xam/apichanges.xml +++ b/xml.xam/apichanges.xml @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Search for CHANGEME in this document when copying and using it: --> <!-- Licensed to the Apache Software Foundation (ASF) under one diff --git a/xml.xam/test/unit/src/org/netbeans/modules/xml/xam/dom/ReadOnlyAccessTest.java b/xml.xam/test/unit/src/org/netbeans/modules/xml/xam/dom/ReadOnlyAccessTest.java index 3f1c08df7..f6ead9d29 100644 --- a/xml.xam/test/unit/src/org/netbeans/modules/xml/xam/dom/ReadOnlyAccessTest.java +++ b/xml.xam/test/unit/src/org/netbeans/modules/xml/xam/dom/ReadOnlyAccessTest.java @@ -49,58 +49,58 @@ public static Test suite() { public void testFindPosition() throws Exception { TestModel2 model = Util.loadModel("resources/test1.xml"); - assertEquals(38 + lsl, model.getRootComponent().findPosition()); + assertEquals(860 + lsl, model.getRootComponent().findPosition()); assertEquals(4, model.getRootComponent().getChildren().size()); TestComponent2 component = model.getRootComponent().getChildren().get(0); assertEquals("a", component.getPeer().getLocalName()); - assertEquals(133 + lsl * 4, component.findPosition()); + assertEquals(955 + lsl * 4, component.findPosition()); } public void testFindPositionWithPrefix() throws Exception { TestModel2 model = Util.loadModel("resources/test1.xml"); TestComponent2.B b = model.getRootComponent().getChildren(TestComponent2.B.class).get(0); TestComponent2.Aa aa = b.getChildren(TestComponent2.Aa.class).get(0); - assertEquals(206 + lsl * 6, aa.findPosition()); + assertEquals(1028 + lsl * 6, aa.findPosition()); } public void testFindPositionWithElementTagInAttr() throws Exception { TestModel2 model = Util.loadModel("resources/test1.xml"); TestComponent2.C c = model.getRootComponent().getChildren(TestComponent2.C.class).get(0); - assertEquals(245 + lsl * 8, c.findPosition()); + assertEquals(1067 + lsl * 8, c.findPosition()); } public void testFindElement() throws Exception { TestModel2 model = Util.loadModel("resources/test1.xml"); TestComponent2 component = model.getRootComponent().getChildren().get(0); - assertEquals(component, model.findComponent(133 + lsl * 4)); - assertEquals(component, model.findComponent(147 + lsl * 4)); - assertEquals(component, model.findComponent(161 + lsl * 5)); + assertEquals(component, model.findComponent(955 + lsl * 4)); + assertEquals(component, model.findComponent(969 + lsl * 4)); + assertEquals(component, model.findComponent(983 + lsl * 5)); } public void testFindElementWithPrefix() throws Exception { TestModel2 model = Util.loadModel("resources/test1.xml"); TestComponent2.B b = model.getRootComponent().getChildren(TestComponent2.B.class).get(0); TestComponent2.Aa aa = b.getChildren(TestComponent2.Aa.class).get(0); - assertEquals(aa, model.findComponent(206 + lsl * 6)); - assertEquals(aa, model.findComponent(218 + lsl * 6)); - assertEquals(aa, model.findComponent(232 + lsl * 6)); + assertEquals(aa, model.findComponent(1028 + lsl * 6)); + assertEquals(aa, model.findComponent(1040 + lsl * 6)); + assertEquals(aa, model.findComponent(1054 + lsl * 6)); } public void testFindElementWithTagInAttr() throws Exception { TestModel2 model = Util.loadModel("resources/test1.xml"); TestComponent2.C c = model.getRootComponent().getChildren(TestComponent2.C.class).get(0); - assertEquals(c, model.findComponent(245 + lsl * 8)); - assertEquals(c, model.findComponent(249 + lsl * 8)); - assertEquals(c, model.findComponent(261 + lsl * 8)); + assertEquals(c, model.findComponent(1067 + lsl * 8)); + assertEquals(c, model.findComponent(1071 + lsl * 8)); + assertEquals(c, model.findComponent(1083 + lsl * 8)); } public void testFindElementGivenTextPosition() throws Exception { TestModel2 model = Util.loadModel("resources/test1.xml"); TestComponent2 root = model.getRootComponent(); TestComponent2.B b = root.getChildren(TestComponent2.B.class).get(0); - assertEquals(b, model.findComponent(201 + lsl * 5)); - assertEquals(root, model.findComponent(244 + lsl * 8)); - assertEquals(root, model.findComponent(265 + lsl * 9)); + assertEquals(b, model.findComponent(1023 + lsl * 5)); + assertEquals(root, model.findComponent(1066 + lsl * 8)); + assertEquals(root, model.findComponent(1087 + lsl * 9)); } public void testGetXmlFragment() throws Exception { diff --git a/xml.xam/test/unit/src/org/netbeans/modules/xml/xam/locator/api/dummyFile.txt b/xml.xam/test/unit/src/org/netbeans/modules/xml/xam/locator/api/dummyFile.txt index e69de29bb..d0d402485 100644 --- a/xml.xam/test/unit/src/org/netbeans/modules/xml/xam/locator/api/dummyFile.txt +++ b/xml.xam/test/unit/src/org/netbeans/modules/xml/xam/locator/api/dummyFile.txt @@ -0,0 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +Dummy file \ No newline at end of file diff --git a/xml.xam/test/unit/src/org/netbeans/modules/xml/xam/resources/test1.xml b/xml.xam/test/unit/src/org/netbeans/modules/xml/xam/resources/test1.xml index 55d5f1217..ef93eb720 100644 --- a/xml.xam/test/unit/src/org/netbeans/modules/xml/xam/resources/test1.xml +++ b/xml.xam/test/unit/src/org/netbeans/modules/xml/xam/resources/test1.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <test xmlns="http://www.test.com/TestModel" xmlns:t2="http://www.test2.com/TestModel" > diff --git a/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/XDMModelTest.java b/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/XDMModelTest.java index 491e019b6..a2c846f39 100644 --- a/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/XDMModelTest.java +++ b/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/XDMModelTest.java @@ -61,7 +61,8 @@ public static Test suite() { suite.addTest(new XDMModelTest("testModifyNegative")); suite.addTest(new XDMModelTest("testSyncAndNamespace")); suite.addTest(new XDMModelTest("testSyncToEmptyRoot")); - suite.addTest(new XDMModelTest("testXDMModelSize")); +// Disabled as referenced files were partly not donated by oracle to apache +// suite.addTest(new XDMModelTest("testXDMModelSize")); return suite; } diff --git a/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/diff/DiffFinderTest.java b/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/diff/DiffFinderTest.java index 6d9a5e88a..70025ce4a 100644 --- a/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/diff/DiffFinderTest.java +++ b/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/diff/DiffFinderTest.java @@ -52,8 +52,9 @@ public static Test suite() { suite.addTest(new DiffFinderTest("testFindDiff1")); suite.addTest(new DiffFinderTest("testFindDiff2")); suite.addTest(new DiffFinderTest("testFindDiff3")); - suite.addTest(new DiffFinderTest("testFindDiffPerf")); - suite.addTest(new DiffFinderTest("testFindDiffPerf2")); +// Disabled as referenced files were partly not donated by oracle to apache +// suite.addTest(new DiffFinderTest("testFindDiffPerf")); +// suite.addTest(new DiffFinderTest("testFindDiffPerf2")); suite.addTest(new DiffFinderTest("testElementAddedBeforeChildAttributeChange")); suite.addTest(new DiffFinderTest("testElementAddedBeforeChildAttributeChange2")); return suite; diff --git a/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/diff/MergeDiffTest.java b/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/diff/MergeDiffTest.java index 4b119d90b..5f773b053 100644 --- a/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/diff/MergeDiffTest.java +++ b/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/diff/MergeDiffTest.java @@ -77,12 +77,14 @@ public static Test suite() { TestSuite suite = new TestSuite(); suite.addTest(new MergeDiffTest("testMerge1")); suite.addTest(new MergeDiffTest("testMerge2")); - suite.addTest(new MergeDiffTest("testMerge3")); +// Disabled as referenced files were partly not donated by oracle to apache +// suite.addTest(new MergeDiffTest("testMerge3")); suite.addTest(new MergeDiffTest("testMerge4")); suite.addTest(new MergeDiffTest("testMerge5")); suite.addTest(new MergeDiffTest("testMerge6")); suite.addTest(new MergeDiffTest("testMerge7")); - suite.addTest(new MergeDiffTest("testMerge8")); +// Disabled as referenced files were partly not donated by oracle to apache +// suite.addTest(new MergeDiffTest("testMerge8")); suite.addTest(new MergeDiffTest("testMerge9")); suite.addTest(new MergeDiffTest("testMerge10")); suite.addTest(new MergeDiffTest("testPrettyPrint")); @@ -94,7 +96,8 @@ public static Test suite() { suite.addTest(new MergeDiffTest("testPosChange3")); suite.addTest(new MergeDiffTest("testPosChange3_2")); suite.addTest(new MergeDiffTest("testPosChange3_3")); - suite.addTest(new MergeDiffTest("testMergeVenetianBlindPO")); +// Disabled as referenced files were partly not donated by oracle to apache +// suite.addTest(new MergeDiffTest("testMergeVenetianBlindPO")); suite.addTest(new MergeDiffTest("testForwardReorderNodeWithChangesOnChildren")); suite.addTest(new MergeDiffTest("testMergeReformatDiff")); return suite; diff --git a/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/nodes/XMLSyntaxParserTest.java b/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/nodes/XMLSyntaxParserTest.java index 73dcd3893..c3cdbb628 100644 --- a/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/nodes/XMLSyntaxParserTest.java +++ b/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/nodes/XMLSyntaxParserTest.java @@ -62,7 +62,8 @@ public static Test suite() { suite.addTest(new XMLSyntaxParserTest("testParseTestXML")); suite.addTest(new XMLSyntaxParserTest("testMultiRootXML")); suite.addTest(new XMLSyntaxParserTest("testParseWSDL")); - suite.addTest(new XMLSyntaxParserTest("testParsePerformace")); +// Disabled as referenced files were partly not donated by oracle to apache +// suite.addTest(new XMLSyntaxParserTest("testParsePerformace")); return suite; } diff --git a/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/perf/XDMPerfNumberTest.java b/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/perf/XDMPerfNumberTest.java index 5e3ce6d75..f84d3150c 100644 --- a/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/perf/XDMPerfNumberTest.java +++ b/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/perf/XDMPerfNumberTest.java @@ -87,9 +87,10 @@ protected void tearDown() throws Exception { public static Test suite() { TestSuite suite = new TestSuite(); - suite.addTest(new XDMPerfNumberTest("testReadUsingDOM")); - suite.addTest(new XDMPerfNumberTest("testReadUsingSyntaxParser")); - suite.addTest(new XDMPerfNumberTest("testReadUsingXDM")); +// Disabled as referenced files were partly not donated by oracle to apache +// suite.addTest(new XDMPerfNumberTest("testReadUsingDOM")); +// suite.addTest(new XDMPerfNumberTest("testReadUsingSyntaxParser")); +// suite.addTest(new XDMPerfNumberTest("testReadUsingXDM")); return suite; } diff --git a/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/visitor/FindNamespaceVisitorTest.java b/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/visitor/FindNamespaceVisitorTest.java index b1aaf7d25..cfb21cd64 100644 --- a/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/visitor/FindNamespaceVisitorTest.java +++ b/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/visitor/FindNamespaceVisitorTest.java @@ -52,8 +52,9 @@ protected void setUp() throws Exception { } public static Test suite() { - TestSuite suite = new TestSuite(FindNamespaceVisitorTest.class); - + TestSuite suite = new TestSuite(); +// Disabled as referenced files were partly not donated by oracle to apache +// suite.addTestSuite(FindNamespaceVisitorTest.class); return suite; } diff --git a/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/visitor/XPathFinderTest.java b/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/visitor/XPathFinderTest.java index 83c928258..54730819a 100644 --- a/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/visitor/XPathFinderTest.java +++ b/xml.xdm/test/unit/src/org/netbeans/modules/xml/xdm/visitor/XPathFinderTest.java @@ -46,8 +46,9 @@ protected void tearDown() throws Exception { } public static Test suite() { - TestSuite suite = new TestSuite(XPathFinderTest.class); - + TestSuite suite = new TestSuite(); +// Disabled as referenced files were partly not donated by oracle to apache +// suite.addTestSuite(XPathFinderTest.class); return suite; } diff --git a/xml/test/qa-functional/data/ActionsTestProject/nbproject/ant-deploy.xml b/xml/test/qa-functional/data/ActionsTestProject/nbproject/ant-deploy.xml index 7ec8e3029..f879516d0 100644 --- a/xml/test/qa-functional/data/ActionsTestProject/nbproject/ant-deploy.xml +++ b/xml/test/qa-functional/data/ActionsTestProject/nbproject/ant-deploy.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project default="-deploy-ant" basedir="."> <target name="-init-cl-deployment-env" if="deploy.ant.enabled"> <property file="${deploy.ant.properties.file}" /> diff --git a/xml/test/qa-functional/data/ActionsTestProject/nbproject/project.properties b/xml/test/qa-functional/data/ActionsTestProject/nbproject/project.properties index 9798f13dc..12db51632 100644 --- a/xml/test/qa-functional/data/ActionsTestProject/nbproject/project.properties +++ b/xml/test/qa-functional/data/ActionsTestProject/nbproject/project.properties @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + build.classes.dir=${build.web.dir}/WEB-INF/classes build.classes.excludes=**/*.java,**/*.form build.dir=build diff --git a/xml/test/qa-functional/data/ActionsTestProject/nbproject/project.xml b/xml/test/qa-functional/data/ActionsTestProject/nbproject/project.xml index fcccfd54f..e35ab38dc 100644 --- a/xml/test/qa-functional/data/ActionsTestProject/nbproject/project.xml +++ b/xml/test/qa-functional/data/ActionsTestProject/nbproject/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.web.project</type> <configuration> diff --git a/xml/test/qa-functional/data/ActionsTestProject/web/DTDformed.dtd b/xml/test/qa-functional/data/ActionsTestProject/web/DTDformed.dtd index 63a7f3ad4..33637d97b 100644 --- a/xml/test/qa-functional/data/ActionsTestProject/web/DTDformed.dtd +++ b/xml/test/qa-functional/data/ActionsTestProject/web/DTDformed.dtd @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- Document : DTDexample.dtd diff --git a/xml/test/qa-functional/data/ActionsTestProject/web/DTDformed.xml b/xml/test/qa-functional/data/ActionsTestProject/web/DTDformed.xml index 76408222e..91c1066e5 100644 --- a/xml/test/qa-functional/data/ActionsTestProject/web/DTDformed.xml +++ b/xml/test/qa-functional/data/ActionsTestProject/web/DTDformed.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- Document : newXMLDocument.xml diff --git a/xml/test/qa-functional/data/ActionsTestProject/web/META-INF/context.xml b/xml/test/qa-functional/data/ActionsTestProject/web/META-INF/context.xml index 2ec66addd..672c9d8ce 100644 --- a/xml/test/qa-functional/data/ActionsTestProject/web/META-INF/context.xml +++ b/xml/test/qa-functional/data/ActionsTestProject/web/META-INF/context.xml @@ -1,2 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <Context path="/ActionsTestProject"/> diff --git a/xml/test/qa-functional/data/ActionsTestProject/web/WEB-INF/web.xml b/xml/test/qa-functional/data/ActionsTestProject/web/WEB-INF/web.xml index 9c9847127..960ff545b 100644 --- a/xml/test/qa-functional/data/ActionsTestProject/web/WEB-INF/web.xml +++ b/xml/test/qa-functional/data/ActionsTestProject/web/WEB-INF/web.xml @@ -1,5 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" diff --git a/xml/test/qa-functional/data/ActionsTestProject/web/XMLSchema2GUI.xslt b/xml/test/qa-functional/data/ActionsTestProject/web/XMLSchema2GUI.xslt index 6bb1f4226..6fae36f9e 100644 --- a/xml/test/qa-functional/data/ActionsTestProject/web/XMLSchema2GUI.xslt +++ b/xml/test/qa-functional/data/ActionsTestProject/web/XMLSchema2GUI.xslt @@ -1,5 +1,24 @@ <?xml version="1.0"?> - +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- XML Schema ==> HTML form corresponding the Schema --> diff --git a/xml/test/qa-functional/data/ActionsTestProject/web/index.jsp b/xml/test/qa-functional/data/ActionsTestProject/web/index.jsp index e5dd68a55..c93389353 100644 --- a/xml/test/qa-functional/data/ActionsTestProject/web/index.jsp +++ b/xml/test/qa-functional/data/ActionsTestProject/web/index.jsp @@ -1,3 +1,23 @@ +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <%@page contentType="text/html"%> <%@page pageEncoding="UTF-8"%> <%-- diff --git a/xml/test/qa-functional/data/ActionsTestProject/web/sampleXMLSchema.xml b/xml/test/qa-functional/data/ActionsTestProject/web/sampleXMLSchema.xml index 7d3be718f..cd54d4fa4 100644 --- a/xml/test/qa-functional/data/ActionsTestProject/web/sampleXMLSchema.xml +++ b/xml/test/qa-functional/data/ActionsTestProject/web/sampleXMLSchema.xml @@ -1,4 +1,24 @@ <?xml version='1.0'?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- Commented out for IE5 which doesn't understand : diff --git a/xml/test/qa-functional/data/ActionsTestProject/web/shiporder.xsd b/xml/test/qa-functional/data/ActionsTestProject/web/shiporder.xsd index a1a632b06..7a56e8b17 100644 --- a/xml/test/qa-functional/data/ActionsTestProject/web/shiporder.xsd +++ b/xml/test/qa-functional/data/ActionsTestProject/web/shiporder.xsd @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="ISO-8859-1" ?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:simpleType name="stringtype"> diff --git a/xml/test/qa-functional/data/ActionsTestProject/web/shiporders.xml b/xml/test/qa-functional/data/ActionsTestProject/web/shiporders.xml index d453fa2ec..aea6b214b 100644 --- a/xml/test/qa-functional/data/ActionsTestProject/web/shiporders.xml +++ b/xml/test/qa-functional/data/ActionsTestProject/web/shiporders.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <shiporders > <shiporder orderid="188923"> <orderperson>John Smith</orderperson> diff --git a/xml/test/qa-functional/data/ActionsTestProject/web/well.xml b/xml/test/qa-functional/data/ActionsTestProject/web/well.xml index c33face75..b75bd302b 100644 --- a/xml/test/qa-functional/data/ActionsTestProject/web/well.xml +++ b/xml/test/qa-functional/data/ActionsTestProject/web/well.xml @@ -1,5 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!DOCTYPE note [ <!ELEMENT note (to, from, heading, body)> <!ELEMENT to (#PCDATA)> diff --git a/xml/test/qa-functional/data/CoreTemplatesTestProject/build.xml b/xml/test/qa-functional/data/CoreTemplatesTestProject/build.xml index 75c52fd48..f9f3ec4d9 100644 --- a/xml/test/qa-functional/data/CoreTemplatesTestProject/build.xml +++ b/xml/test/qa-functional/data/CoreTemplatesTestProject/build.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- You may freely edit this file. See commented blocks below for --> <!-- some examples of how to customize the build. --> <!-- (If you delete it and reopen the project it will be recreated.) --> diff --git a/xml/test/qa-functional/data/CoreTemplatesTestProject/nbproject/ant-deploy.xml b/xml/test/qa-functional/data/CoreTemplatesTestProject/nbproject/ant-deploy.xml index 7ec8e3029..f879516d0 100644 --- a/xml/test/qa-functional/data/CoreTemplatesTestProject/nbproject/ant-deploy.xml +++ b/xml/test/qa-functional/data/CoreTemplatesTestProject/nbproject/ant-deploy.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project default="-deploy-ant" basedir="."> <target name="-init-cl-deployment-env" if="deploy.ant.enabled"> <property file="${deploy.ant.properties.file}" /> diff --git a/xml/test/qa-functional/data/CoreTemplatesTestProject/nbproject/jax-ws.xml b/xml/test/qa-functional/data/CoreTemplatesTestProject/nbproject/jax-ws.xml index ce6790073..e365c431d 100644 --- a/xml/test/qa-functional/data/CoreTemplatesTestProject/nbproject/jax-ws.xml +++ b/xml/test/qa-functional/data/CoreTemplatesTestProject/nbproject/jax-ws.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <jax-ws xmlns="http://www.netbeans.org/ns/jax-ws/1"> <services/> <clients/> diff --git a/xml/test/qa-functional/data/CoreTemplatesTestProject/nbproject/project.properties b/xml/test/qa-functional/data/CoreTemplatesTestProject/nbproject/project.properties index 9c2428b50..bada817b2 100644 --- a/xml/test/qa-functional/data/CoreTemplatesTestProject/nbproject/project.properties +++ b/xml/test/qa-functional/data/CoreTemplatesTestProject/nbproject/project.properties @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + build.classes.dir=${build.web.dir}/WEB-INF/classes build.classes.excludes=**/*.java,**/*.form build.dir=build diff --git a/xml/test/qa-functional/data/CoreTemplatesTestProject/nbproject/project.xml b/xml/test/qa-functional/data/CoreTemplatesTestProject/nbproject/project.xml index 2a38ad4cc..73852c1bb 100644 --- a/xml/test/qa-functional/data/CoreTemplatesTestProject/nbproject/project.xml +++ b/xml/test/qa-functional/data/CoreTemplatesTestProject/nbproject/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.web.project</type> <configuration> diff --git a/xml/test/qa-functional/data/CoreTemplatesTestProject/web/META-INF/context.xml b/xml/test/qa-functional/data/CoreTemplatesTestProject/web/META-INF/context.xml index 5f812e0f4..c77bfb3d4 100644 --- a/xml/test/qa-functional/data/CoreTemplatesTestProject/web/META-INF/context.xml +++ b/xml/test/qa-functional/data/CoreTemplatesTestProject/web/META-INF/context.xml @@ -1,2 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <Context path="/CoreTemplatesTestProject"/> diff --git a/xml/test/qa-functional/data/CoreTemplatesTestProject/web/WEB-INF/web.xml b/xml/test/qa-functional/data/CoreTemplatesTestProject/web/WEB-INF/web.xml index 9c9847127..960ff545b 100644 --- a/xml/test/qa-functional/data/CoreTemplatesTestProject/web/WEB-INF/web.xml +++ b/xml/test/qa-functional/data/CoreTemplatesTestProject/web/WEB-INF/web.xml @@ -1,5 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" diff --git a/xml/test/qa-functional/data/DTDActionsTestProject/build.xml b/xml/test/qa-functional/data/DTDActionsTestProject/build.xml index 1da747ef6..77967b340 100644 --- a/xml/test/qa-functional/data/DTDActionsTestProject/build.xml +++ b/xml/test/qa-functional/data/DTDActionsTestProject/build.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- You may freely edit this file. See commented blocks below for --> <!-- some examples of how to customize the build. --> <!-- (If you delete it and reopen the project it will be recreated.) --> diff --git a/xml/test/qa-functional/data/DTDActionsTestProject/nbproject/ant-deploy.xml b/xml/test/qa-functional/data/DTDActionsTestProject/nbproject/ant-deploy.xml index 7ec8e3029..f879516d0 100644 --- a/xml/test/qa-functional/data/DTDActionsTestProject/nbproject/ant-deploy.xml +++ b/xml/test/qa-functional/data/DTDActionsTestProject/nbproject/ant-deploy.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project default="-deploy-ant" basedir="."> <target name="-init-cl-deployment-env" if="deploy.ant.enabled"> <property file="${deploy.ant.properties.file}" /> diff --git a/xml/test/qa-functional/data/DTDActionsTestProject/nbproject/project.properties b/xml/test/qa-functional/data/DTDActionsTestProject/nbproject/project.properties index c8909af7e..3446cb847 100644 --- a/xml/test/qa-functional/data/DTDActionsTestProject/nbproject/project.properties +++ b/xml/test/qa-functional/data/DTDActionsTestProject/nbproject/project.properties @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + build.classes.dir=${build.web.dir}/WEB-INF/classes build.classes.excludes=**/*.java,**/*.form build.dir=build diff --git a/xml/test/qa-functional/data/DTDActionsTestProject/nbproject/project.xml b/xml/test/qa-functional/data/DTDActionsTestProject/nbproject/project.xml index 0e7945966..432c85e83 100644 --- a/xml/test/qa-functional/data/DTDActionsTestProject/nbproject/project.xml +++ b/xml/test/qa-functional/data/DTDActionsTestProject/nbproject/project.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.web.project</type> <configuration> diff --git a/xml/test/qa-functional/data/DTDActionsTestProject/web/META-INF/context.xml b/xml/test/qa-functional/data/DTDActionsTestProject/web/META-INF/context.xml index 2894b7053..5beabccf3 100644 --- a/xml/test/qa-functional/data/DTDActionsTestProject/web/META-INF/context.xml +++ b/xml/test/qa-functional/data/DTDActionsTestProject/web/META-INF/context.xml @@ -1,2 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <Context path="/DTDActionsTestProject"/> diff --git a/xml/test/qa-functional/data/DTDActionsTestProject/web/WEB-INF/web.xml b/xml/test/qa-functional/data/DTDActionsTestProject/web/WEB-INF/web.xml index 9c9847127..960ff545b 100644 --- a/xml/test/qa-functional/data/DTDActionsTestProject/web/WEB-INF/web.xml +++ b/xml/test/qa-functional/data/DTDActionsTestProject/web/WEB-INF/web.xml @@ -1,5 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" diff --git a/xml/test/qa-functional/data/DTDActionsTestProject/web/testDTD.dtd b/xml/test/qa-functional/data/DTDActionsTestProject/web/testDTD.dtd index ad7a1be11..857ee688d 100644 --- a/xml/test/qa-functional/data/DTDActionsTestProject/web/testDTD.dtd +++ b/xml/test/qa-functional/data/DTDActionsTestProject/web/testDTD.dtd @@ -1,5 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> - +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!ENTITY AUTHOR "John Doe"> <!ENTITY COMPANY "JD Power Tools, Inc."> <!ENTITY EMAIL "jd@jd-tools.com"> diff --git a/xml/test/qa-functional/data/people.xsd b/xml/test/qa-functional/data/people.xsd index dbde8bccf..e717e800b 100644 --- a/xml/test/qa-functional/data/people.xsd +++ b/xml/test/qa-functional/data/people.xsd @@ -1,3 +1,23 @@ +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"> <!--deklarace jednoduchých typů --> <xs:simpleType name="plat"> diff --git a/xml/test/qa-functional/data/sample.dtd b/xml/test/qa-functional/data/sample.dtd index a0a7f9f1a..ee1b075e5 100644 --- a/xml/test/qa-functional/data/sample.dtd +++ b/xml/test/qa-functional/data/sample.dtd @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- Document : newemptyDTD.dtd diff --git a/xml/test/unit/data/dummyXMLDocument.xml b/xml/test/unit/data/dummyXMLDocument.xml index 466dfdd97..e91c60905 100644 --- a/xml/test/unit/data/dummyXMLDocument.xml +++ b/xml/test/unit/data/dummyXMLDocument.xml @@ -1,2 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <root></root> diff --git a/xml/test/unit/src/org/netbeans/modules/xml/wizard/data/dtd.dtd b/xml/test/unit/src/org/netbeans/modules/xml/wizard/data/dtd.dtd index 7c5907082..edc16c364 100644 --- a/xml/test/unit/src/org/netbeans/modules/xml/wizard/data/dtd.dtd +++ b/xml/test/unit/src/org/netbeans/modules/xml/wizard/data/dtd.dtd @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- Document : dtd.dtd diff --git a/xml/test/unit/src/org/netbeans/modules/xml/wizard/data/schemaWithNS.xsd b/xml/test/unit/src/org/netbeans/modules/xml/wizard/data/schemaWithNS.xsd index 696512962..d6ca4819c 100644 --- a/xml/test/unit/src/org/netbeans/modules/xml/wizard/data/schemaWithNS.xsd +++ b/xml/test/unit/src/org/netbeans/modules/xml/wizard/data/schemaWithNS.xsd @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!-- Document : schemaWithNS.xsd ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          613. juneau001 commented on issue #117: [NETBEANS-54] Modeule Review j2ee.persistence URL: https://github.com/apache/incubator-netbeans/pull/117#issuecomment-339787511 Thanks @matthiasblaesing I appreciate the assistance. Not sure why the rebase and squash did not work, maybe I missed a commit in between. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          614. geertjanw commented on issue #194: [NETBEANS-54] Module Review java.platform.ui URL: https://github.com/apache/incubator-netbeans/pull/194#issuecomment-339788481 Thanks, merging. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          615. geertjanw closed pull request #194: [NETBEANS-54] Module Review java.platform.ui URL: https://github.com/apache/incubator-netbeans/pull/194 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/nbbuild/build.xml b/nbbuild/build.xml index 6e4217417..daf0311bb 100644 --- a/nbbuild/build.xml +++ b/nbbuild/build.xml @@ -2009,6 +2009,7 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <exclude name="java.api.common/src/org/netbeans/modules/java/api/common/project/ui/customizer/vmo/gen/CommandLine.tokens" /> <!--generated by ANTLR--> <exclude name="java.editor/src/org/netbeans/modules/java/editor/resources/JavaExample" /> <!--no degree of creativity--> <exclude name="java.j2semodule/src/org/netbeans/modules/java/j2semodule/ui/resources/module-info.java.template" /> <!--template file--> + <exclude name="java.platform.ui/src/org/netbeans/modules/java/platform/resources/templates/javaplatform.xml" /> <!--template file--> <exclude name="javafx2.kit/release/VERSION.txt" /> <!--generated file--> <exclude name="javafx2.project/src/org/netbeans/modules/javafx2/project/templates/**" /> <!--license would be visible when users edit the templates inside their IDE--> <exclude name="javawebstart/AntTasks/build/**" /> <!-- generated build files --> ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          616. rosslamont commented on issue #163: [NETBEANS-54] Module Review maven.indexer URL: https://github.com/apache/incubator-netbeans/pull/163#issuecomment-339822005 Thanks Javier, I didn’t know about that. Is this something committers do? Or something I was meant to do as a contributor? I mis-spoke in my prior comment, what I was concerned about was squashing a conflict merge, i.e. the additional commits are to do with sorting out the conflict with base (I don’t know why GitHub made me do 2 commits. I read somewhere git can get confused with how it tracks conflicts if you mess around with squashing. Is there something else I can do to finish this as a contributor? Cheers Ross > On 27 Oct 2017, at 5:40 am, Javier A. Ortiz Bultron <notifications@github.com> wrote: > > In all my GitHub projects I can configure how PR are handled. From allowing all types (merge, squash, etc.) to selecting one or some of them. > > If squashing is the preferred way it should be probably the only option. Usually the person(s) configured to merge to trunk can choose which one. > > <https://user-images.githubusercontent.com/2817343/32070839-27439ce8-ba53-11e7-8b4b-0b97e2136695.png> > — > You are receiving this because you authored the thread. > Reply to this email directly, view it on GitHub <https://github.com/apache/incubator-netbeans/pull/163#issuecomment-339760312>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AXKC2P8DbNMsAXydNECz8VBYZqJkHB1-ks5swNISgaJpZM4P-f2H>. > ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          617. geertjanw commented on issue #181: [NETBEANS-54] Module Review libs.osgi (followup) URL: https://github.com/apache/incubator-netbeans/pull/181#issuecomment-339908629 Something happened here: https://issues.apache.org/jira/browse/NETBEANS-105 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          618. jlahoda commented on issue #181: [NETBEANS-54] Module Review libs.osgi (followup) URL: https://github.com/apache/incubator-netbeans/pull/181#issuecomment-340083459 Ok (we should look at using a more standard artefact, but as you say, that is a separate task). Thanks for fixing this. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          619. vieiro commented on a change in pull request #181: [NETBEANS-54] Module Review libs.osgi (followup) URL: https://github.com/apache/incubator-netbeans/pull/181#discussion_r147527253 ########## File path: libs.osgi/build.xml ########## @@ -22,4 +22,29 @@ <project basedir="." default="netbeans" name="libs.osgi"> <description>Builds, tests, and runs the project org.netbeans.libs.osgi</description> <import file="../nbbuild/templates/projectized.xml"/> + + <!-- A task to check if the binary 'external/resolver-1.2.jar exists --> Review comment: Idea: This should read "A task to check if the binary 'external/osgi.cmpn-4.2.jar exists" ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          620. vieiro commented on a change in pull request #181: [NETBEANS-54] Module Review libs.osgi (followup) URL: https://github.com/apache/incubator-netbeans/pull/181#discussion_r147527324 ########## File path: libs.osgi/build.xml ########## @@ -22,4 +22,29 @@ <project basedir="." default="netbeans" name="libs.osgi"> <description>Builds, tests, and runs the project org.netbeans.libs.osgi</description> <import file="../nbbuild/templates/projectized.xml"/> + + <!-- A task to check if the binary 'external/resolver-1.2.jar exists --> + <target name="-check-requires-patching-maven-sources"> + <available file="external/osgi.cmpn-4.2.jar" property="sources-already-patched" /> + </target> + + <!-- + '-javac-init' task is invoked after maven sources have been downloaded + to 'external/org.osgi.compendium-4.2.0.jar' + (see external/binaries-list). + Netbeans had its own copy of osgi.cmpn-4.2.jar, which is identical to + the downloaded binary. The downloaded binary contains the source code + in addition to the compiled class files. + The sources are now stripped from the binary to create the original file + netbeans used to bundle. + --> + <target name="-prepare-patched-binary" depends="-check-requires-patching-maven-sources" unless="sources-already-patched"> + <echo message="Patching org.osgi.compendium-4.2.0 for Netbeans..." /> + <zip destfile="external/osgi.cmpn-4.2.jar"> + <zipfileset src="external/org.osgi.compendium-4.2.0.jar" excludes="OSGI-OPT/**" /> + </zip> + </target> + + <!-- Hook into harness "basic-init" task --> Review comment: Another idea: This should read "Hook into harness "javac-init" task" ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          621. geertjanw commented on issue #42: [NETBEANS-54] Module Review editor URL: https://github.com/apache/incubator-netbeans/pull/42#issuecomment-340160179 What about these, can you exclude them via Rat or license them: editor/demosrc/base/org/netbeans/editor/example/res/template.html_ editor/demosrc/base/org/netbeans/editor/example/res/template.java_ editor/demosrc/properties-addon/org/netbeans/editor/example/res/template.properties editor/test/qa-functional/src/org/netbeans/test/editor/suites/keybindings/actions.txt editor/test/unit/src/org/netbeans/modules/editor/resources/testAnnotation.xml editor/test/unit/src/org/netbeans/modules/editor/resources/testAnnotation1.xml editor/test/unit/src/org/netbeans/modules/editor/resources/testAnnotation2.xml editor/test/unit/src/org/netbeans/modules/editor/resources/testAnnotation3.xml editor/test/unit/src/org/netbeans/modules/editor/resources/testAnnotation4.xml editor/test/unit/src/org/netbeans/modules/editor/resources/testAnnotation5.xml editor/test/unit/src/org/netbeans/modules/editor/resources/testAnnotation6.xml editor/test/unit/src/org/netbeans/modules/editor/resources/testAnnotation7.xml editor/test/unit/src/org/netbeans/modules/editor/resources/testAnnotation8.xml editor/test/unit/src/org/netbeans/modules/editor/resources/testAnnotationBrowseable1.xml editor/test/unit/src/org/netbeans/modules/editor/resources/testAnnotationBrowseable2.xml editor/test/unit/src/org/netbeans/modules/editor/resources/testAnnotationBrowseable3.xml editor/test/unit/src/org/netbeans/modules/editor/resources/testAnnotationPriority1.xml editor/test/unit/src/org/netbeans/modules/editor/resources/testAnnotationPriority2.xml editor/test/unit/src/org/netbeans/modules/editor/resources/testAnnotationPriority3.xml editor/test/unit/src/org/netbeans/modules/editor/resources/testAnnotationPriority4.xml ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          622. geertjanw opened a new pull request #197: [NETBEANS-54] excluding test data from project.ant URL: https://github.com/apache/incubator-netbeans/pull/197 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          623. geertjanw opened a new pull request #198: [NETBEANS-54] Module Review welcome URL: https://github.com/apache/incubator-netbeans/pull/198 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          624. geertjanw opened a new pull request #199: [NETBEANS-54] excluding nbbuild/netbeans/** via Rat URL: https://github.com/apache/incubator-netbeans/pull/199 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          625. matthiasblaesing closed pull request #181: [NETBEANS-54] Module Review libs.osgi (followup) URL: https://github.com/apache/incubator-netbeans/pull/181 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/libs.osgi/build.xml b/libs.osgi/build.xml index 3a50ab838..978f82a50 100644 --- a/libs.osgi/build.xml +++ b/libs.osgi/build.xml @@ -22,4 +22,29 @@ <project basedir="." default="netbeans" name="libs.osgi"> <description>Builds, tests, and runs the project org.netbeans.libs.osgi</description> <import file="../nbbuild/templates/projectized.xml"/> + + <!-- A task to check if the binary 'external/osgi.cmpn-4.2.jar' exists --> + <target name="-check-requires-patching-maven-sources"> + <available file="external/osgi.cmpn-4.2.jar" property="sources-already-patched" /> + </target> + + <!-- + '-javac-init' task is invoked after maven sources have been downloaded + to 'external/org.osgi.compendium-4.2.0.jar' + (see external/binaries-list). + Netbeans had its own copy of osgi.cmpn-4.2.jar, which is identical to + the downloaded binary. The downloaded binary contains the source code + in addition to the compiled class files. + The sources are now stripped from the binary to create the original file + netbeans used to bundle. + --> + <target name="-prepare-patched-binary" depends="-check-requires-patching-maven-sources" unless="sources-already-patched"> + <echo message="Patching org.osgi.compendium-4.2.0 for Netbeans..." /> + <zip destfile="external/osgi.cmpn-4.2.jar"> + <zipfileset src="external/org.osgi.compendium-4.2.0.jar" excludes="OSGI-OPT/**" /> + </zip> + </target> + + <!-- Hook into harness "-javac-init" task --> + <target name="-javac-init" depends="-prepare-patched-binary, projectized-common.-javac-init" /> </project> diff --git a/libs.osgi/external/binaries-list b/libs.osgi/external/binaries-list index 17e5e684e..04a2d9c82 100644 --- a/libs.osgi/external/binaries-list +++ b/libs.osgi/external/binaries-list @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD org.netbeans.external:osgi.cmpn:4.2 +1E506145EC53132BCE79CE8798D98026B598FD48 org.osgi:org.osgi.compendium:4.2.0 2F2FBFF3FB80F91B159A7FA9F0C42A894BB8BCC5 org.osgi:osgi.core:5.0.0 diff --git a/libs.osgi/external/osgi-5.0-license.txt b/libs.osgi/external/osgi-5.0-license.txt index 84b2da9b0..807a5531d 100644 --- a/libs.osgi/external/osgi-5.0-license.txt +++ b/libs.osgi/external/osgi-5.0-license.txt @@ -1,6 +1,6 @@ Name: OSGi Version: 5.0 -Files: osgi.core-5.0.0.jar osgi.cmpn-4.2.jar +Files: osgi.core-5.0.0.jar osgi.cmpn-4.2.jar org.osgi.compendium-4.2.0.jar Description: OSGi specification (core & compendium). License: Apache-2.0 Origin: OSGi ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          626. matthiasblaesing commented on issue #181: [NETBEANS-54] Module Review libs.osgi (followup) URL: https://github.com/apache/incubator-netbeans/pull/181#issuecomment-340185592 Merged after adjusting the build.xml by @vieiro comments. Thank you for having a look. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          627. matthiasblaesing commented on issue #197: [NETBEANS-54] excluding test data from project.ant URL: https://github.com/apache/incubator-netbeans/pull/197#issuecomment-340197381 I had a look at the testdata and there is no reason to exclude them from rat. I created PR #200 which holds the adjusted headers and fixes the unittests of the module. I'd appreciate a review. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          628. asfgit closed pull request #175: [NETBEANS-54] Module Review extexecution.process (patch) URL: https://github.com/apache/incubator-netbeans/pull/175 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/extexecution.process/build.xml b/extexecution.process/build.xml index e7740a42d..cce235db9 100644 --- a/extexecution.process/build.xml +++ b/extexecution.process/build.xml @@ -22,4 +22,47 @@ <project basedir="." default="netbeans" name="extexecution.process"> <description>Builds, tests, and runs the project org.netbeans.modules.extexecution.process</description> <import file="../nbbuild/templates/projectized.xml"/> + + <!-- A task to check if the binary 'external/winp-1.14-patched.jar exists --> + <target name="-check-requires-patching-maven-sources"> + <available file="external/winp-1.14-patched.jar" property="sources-already-patched" /> + </target> + + <!-- + '-javac-init' task is invoked after maven sources have been downloaded + to 'external/winp-1.14-sources.jar' + (see external/binaries-list). + Then if 'external/winp-1.14-patched.jar does NOT exist... + --> + <target name="-prepare-patched-binary" depends="-check-requires-patching-maven-sources" unless="sources-already-patched"> + <echo message="Patching winp-1.14-sources.jar for Netbeans..." /> + <taskdef name="patchfile" classname="org.netbeans.nbbuild.extlibs.PatchFile" classpath="${nbantext.jar}"/> + <!-- ... 1. Prepares a 'build/external-patch/[sources|classes]' working directories --> + <delete dir="build/external-patch" /> + <mkdir dir="build/external-patch/sources" /> + <!-- ... 2. Unzips maven sources --> + <unzip src="external/winp-1.14-sources.jar" dest="build/external-patch/sources" /> + <!-- ... 3. Applies patch 'external/winp-1.14-netbeans.patch --> + <patchfile dir="build/external-patch/sources" + patchfile="external/winp.patch" /> + <!-- ... 4. Compiles sources to build/external-patch/classes --> + <mkdir dir="build/external-patch/classes" /> + <javac srcdir="build/external-patch/sources" + destdir="build/external-patch/classes" > + <exclude name="org/apache/xml/resolver/tests/**" /> + </javac> + <!-- ... 4.1. Copy DLLs in sources to classes --> + <copy todir="build/external-patch/classes"> + <fileset dir="build/external-patch/sources"> + <include name="**/**.dll" /> + </fileset> + </copy> + <!-- ... 5. Creates a jar in 'external/winp-1.14-patched.jar' --> + <jar destfile="external/winp-1.14-patched.jar"> + <fileset dir="build/external-patch/classes" /> + </jar> + </target> + + <!-- Hook into harness "-javac-init" task --> + <target name="-javac-init" depends="-prepare-patched-binary, projectized-common.-javac-init" /> </project> diff --git a/extexecution.process/external/binaries-list b/extexecution.process/external/binaries-list index 87de4d3d6..2cc34cd6d 100644 --- a/extexecution.process/external/binaries-list +++ b/extexecution.process/external/binaries-list @@ -15,9 +15,7 @@ # specific language governing permissions and limitations # under the License. # -# winp-1.14-patcher.jar is a patched version of the maven artifact: -# 6A56E64B5F9E78D1F30F960425F7758D08B2A390 org.jvnet.winp:winp:1.1 -C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505 winp-1.14-patched.jar +40E6E127818C371375F8E8D42BBEAF613BDA63A2 org.jvnet.winp:winp:1.14:sources 2E07375E5CA3A452472F0E87FB33F243F7A5C08C org.jvnet.libpam4j:libpam4j:1.1 # processtreekiller is not available in Maven, and its web page was hosted in Kenai, now extinct. 6819C79348FCF4F5125C834E7D3B742582DCA34D processtreekiller-1.0.7.jar diff --git a/extexecution.process/external/winp.patch b/extexecution.process/external/winp.patch index abfa9297e..c6669bb83 100644 --- a/extexecution.process/external/winp.patch +++ b/extexecution.process/external/winp.patch @@ -1,9 +1,22 @@ -# This patch file was generated by NetBeans IDE -# This patch can be applied using context Tools: Apply Diff Patch action on respective folder. -# It uses platform neutral UTF-8 encoding. -# Above lines and this line are ignored by the patching process. ---- /home/sickboy/Desktop/backup/src/main/java/org/jvnet/winp/Native.java -+++ /home/sickboy/Desktop/winp/src/main/java/org/jvnet/winp/Native.java +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +diff -ruN org/jvnet/winp/Native.java patched-org/jvnet/winp/Native.java +--- org/jvnet/winp/Native.java 2009-11-10 10:30:26.000000000 +0100 ++++ patched-org/jvnet/winp/Native.java 2017-10-22 07:11:19.462328071 +0200 @@ -73,8 +73,9 @@ filePortion = filePortion.substring(2); filePortion = URLDecoder.decode(filePortion); ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          629. matthiasblaesing commented on issue #175: [NETBEANS-54] Module Review extexecution.process (patch) URL: https://github.com/apache/incubator-netbeans/pull/175#issuecomment-340198642 Merged - thank you! ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          630. geertjanw commented on issue #199: [NETBEANS-54] excluding nbbuild/licenses/** via Rat URL: https://github.com/apache/incubator-netbeans/pull/199#issuecomment-340200275 Thanks, merging. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          631. geertjanw closed pull request #199: [NETBEANS-54] excluding nbbuild/licenses/** via Rat URL: https://github.com/apache/incubator-netbeans/pull/199 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/nbbuild/build.xml b/nbbuild/build.xml index 84448511b..8ce3bbf1e 100644 --- a/nbbuild/build.xml +++ b/nbbuild/build.xml @@ -2017,6 +2017,7 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <exclude name="languages.yaml/src/org/netbeans/modules/languages/yaml/*.yml" /> <!--Files used in GUI as sample/starting point--> <exclude name="lib.uihandler/test/unit/src/**" /> <!--test data--> <exclude name="mercurial/src/org/netbeans/modules/mercurial/util/log*" /> <!-- user templates for mercurial commits, etc. --> + <exclude name="nbbuild/licenses/**" /> <exclude name="nbbuild/netbeans/**" /> <exclude name="nbbuild/testuserdir/**" /> <exclude name="o.apache.tools.ant.module/release/VERSION.txt" /> <!--generated file--> ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          632. geertjanw commented on issue #197: [NETBEANS-54] excluding test data from project.ant URL: https://github.com/apache/incubator-netbeans/pull/197#issuecomment-340200317 Makes sense, will take a look, and close this one. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          633. geertjanw commented on issue #198: [NETBEANS-54] Module Review welcome URL: https://github.com/apache/incubator-netbeans/pull/198#issuecomment-340200429 Thanks, merging. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          634. geertjanw closed pull request #198: [NETBEANS-54] Module Review welcome URL: https://github.com/apache/incubator-netbeans/pull/198 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/welcome/src/org/netbeans/modules/welcome/resources/Bundle.properties b/welcome/src/org/netbeans/modules/welcome/resources/Bundle.properties index b52bca8d1..782ffab9e 100644 --- a/welcome/src/org/netbeans/modules/welcome/resources/Bundle.properties +++ b/welcome/src/org/netbeans/modules/welcome/resources/Bundle.properties @@ -1,44 +1,19 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved. +# http://www.apache.org/licenses/LICENSE-2.0 # -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. -# -# Contributor(s): -# Sample ResourceBundle properties file - - - +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. # # Web Links # ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          635. matthiasblaesing closed pull request #197: [NETBEANS-54] excluding test data from project.ant URL: https://github.com/apache/incubator-netbeans/pull/197 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/nbbuild/build.xml b/nbbuild/build.xml index fccb6ec3e..e617a9a30 100644 --- a/nbbuild/build.xml +++ b/nbbuild/build.xml @@ -2038,6 +2038,7 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <exclude name="options.editor/src/org/netbeans/modules/options/colors/AllLanguagesExample" /> <!--no degree of creativitya--> <exclude name="options.editor/src/org/netbeans/modules/options/colors/HighlightingExample" /> <!--no degree of creativitya--> <exclude name="options.editor/src/org/netbeans/modules/options/indentation/indentationExample" /> <!--no degree of creativitya--> + <exclude name="project.ant/test/unit/src/org/netbeans/spi/project/support/ant/data/**" /> <!--test data--> <exclude name="projectui/src/org/netbeans/modules/project/ui/resources/*-license.txt" /> <!--licenses--> <exclude name="projectui/src/org/netbeans/modules/project/ui/resources/license-default.txt" /> <!--licenses--> <exclude name="projectuiapi/test/unit/src/org/netbeans/modules/project/uiapi/data/*.txt" /> <!--test data--> ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          636. junichi11 opened a new pull request #202: [NETBEANS-54] Module Review queries URL: https://github.com/apache/incubator-netbeans/pull/202 Exclude `"queries/test/unit/src/org/netbeans/api/queries/data/*"` from rat ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          637. junichi11 opened a new pull request #203: [NETBEANS-54] Module Review root files URL: https://github.com/apache/incubator-netbeans/pull/203 - Add the license header to README.md and .travis.yml We can add the license header to these. Or should we add these to rat exclusions? ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          638. junichi11 closed pull request #202: [NETBEANS-54] Module Review queries URL: https://github.com/apache/incubator-netbeans/pull/202 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/nbbuild/build.xml b/nbbuild/build.xml index c43c71b0f..fac230db7 100644 --- a/nbbuild/build.xml +++ b/nbbuild/build.xml @@ -2044,6 +2044,7 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <exclude name="projectuiapi/test/unit/src/org/netbeans/modules/project/uiapi/data/*.txt" /> <!--test data--> <exclude name="properties/src/org/netbeans/modules/properties/sample.properties.template" /> <!-- template file --> <exclude name="properties.syntax/src/org/netbeans/modules/properties/syntax/PropertiesExample" /> <!-- user visible example for properties language --> + <exclude name="queries/test/unit/src/org/netbeans/api/queries/data/*" /> <!--test data--> <exclude name="selenium2.java/src/org/netbeans/modules/selenium2/java/SeleneseIT.java.template" /> <!--template file--> <exclude name="spellchecker.dictionary_en/release/modules/dict/*.description" /> <!--Description Files--> <exclude name="spi.navigator/test/unit/src/org/netbeans/modules/navigator/resources/lastsel/file.lastsel_mime1" /> <!--empty file--> ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          639. junichi11 opened a new pull request #206: [NETBEANS-54] Module Review updatecenters URL: https://github.com/apache/incubator-netbeans/pull/206 Update the license header in mf-layer.xml ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          640. geertjanw commented on issue #203: [NETBEANS-54] Module Review root files URL: https://github.com/apache/incubator-netbeans/pull/203#issuecomment-340482645 No, this is perfect, thanks. Merging. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          641. geertjanw closed pull request #203: [NETBEANS-54] Module Review root files URL: https://github.com/apache/incubator-netbeans/pull/203 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/.travis.yml b/.travis.yml index 9fc9227b3..34ba11133 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. language: java jdk: - oraclejdk8 diff --git a/README.md b/README.md index 16e79df6a..fe2138aae 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,24 @@ +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> + # Apache NetBeans Apache NetBeans is an open source development environment, tooling platform, and application framework. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          642. junichi11 opened a new pull request #207: [NETBEANS-54] Module Review o.n.upgrader URL: https://github.com/apache/incubator-netbeans/pull/207 Add the license header to systemoptionsimport. This file is used in `o.n.upgrader/src/org/netbeans/upgrade/systemoptions/Importer.java` (see the following). I think that it can be added the license header because it is used as a properties file. https://github.com/apache/incubator-netbeans/blob/7fd9f79a84d02b6122a4089b9b65fc7f8ca3dcb7/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/Importer.java#L33 https://github.com/apache/incubator-netbeans/blob/7fd9f79a84d02b6122a4089b9b65fc7f8ca3dcb7/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/Importer.java#L85-L94 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          643. javydreamercsw commented on issue #207: [NETBEANS-54] Module Review o.n.upgrader URL: https://github.com/apache/incubator-netbeans/pull/207#issuecomment-340523909 Is that the only place it is used? I wouldn't be surprised it was used from somewhere else. if not, why not making it a proper properties file? i.e. systemoptionsimport.properties ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          644. matthiasblaesing commented on issue #207: [NETBEANS-54] Module Review o.n.upgrader URL: https://github.com/apache/incubator-netbeans/pull/207#issuecomment-340538401 I would not rename the file. I would consider the use of the Properties parser as an implementation detail and not call it a properties file (in fact I consider this a misuse of Properties). The loose syntax I see: - each line is interpreted independently - a leading # introduces a comment - empty lines are ignored - lines with content represent a single file to be imported So I would merge it as is. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          645. borxa opened a new pull request #208: [NETBEANS-54] Module Review refactoring.java URL: https://github.com/apache/incubator-netbeans/pull/208 Add license to freemarker files: - Class.java.template - license-default.txt ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          646. junichi11 commented on issue #207: [NETBEANS-54] Module Review o.n.upgrader URL: https://github.com/apache/incubator-netbeans/pull/207#issuecomment-340621456 Thank you for reviewing it! Probably, only this place. Generally, `key=value` form is used in a *.property file. But it does not have "=value". I guess that the author just wanted to get an item per line and the author just used the Properties because it could do that. (We can imagine this from Matthias's comment.) So it would be better we use the current file name. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          647. junichi11 closed pull request #206: [NETBEANS-54] Module Review updatecenters URL: https://github.com/apache/incubator-netbeans/pull/206 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml b/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml index 8a6c911d0..347daf85d 100644 --- a/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml +++ b/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml @@ -1,48 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd"> <!-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" - -Contributor(s): - -The Original Software is NetBeans. The Initial Developer of the Original -Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun -Microsystems, Inc. All Rights Reserved. - -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. --> <filesystem> ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          648. rosslamont commented on issue #163: [NETBEANS-54] Module Review maven.indexer URL: https://github.com/apache/incubator-netbeans/pull/163#issuecomment-340626976 OK, not sure what is holding this back, but I've done all I can here. Ready to merge ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          649. junichi11 commented on issue #208: [NETBEANS-54] Module Review refactoring.java URL: https://github.com/apache/incubator-netbeans/pull/208#issuecomment-340637384 Thank you for working on this. Could you please create a topic branch? Then, please add your changes there. The master branch should be used to update with the upstream master branch. https://github.com/apache/incubator-netbeans/pull/134 was already squashed and merged. But your master branch has their commits. So we have to squash to avoid adding some commits every time when we merge your current master branch into our master branch. To clean your master branch, - Backup your current change: e.g. https://patch-diff.githubusercontent.com/raw/apache/incubator-netbeans/pull/208.diff - Close this PR - Remove your master branch - `git fetch upstream` - Checkout master branch: e.g. `git checkout -b master upstream/master` - Push your master branch: e.g. `git push origin master` probably, need `-f` option to overwrite your master branch. - Create a topic branch: e.g. `git checkout -b your-branch-name` - Apply your backup to your topic branch - Push your topic branch - New PR **NOTE**: I can be wrong. So you should google if you are not sure above. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          650. junichi11 commented on issue #163: [NETBEANS-54] Module Review maven.indexer URL: https://github.com/apache/incubator-netbeans/pull/163#issuecomment-340655691 Probably, `rebase` is preferred than `merge` when a PR is provided. I may be wrong but... - Just in case, save your changes e.g. https://patch-diff.githubusercontent.com/raw/apache/incubator-netbeans/pull/163.diff - `git remote add upstream https://github.com/apache/incubator-netbeans` - `git checkout master` - `git pull upstream master` - `git push origin master` - `git checkout maven_indexer` - `git reset --hard [commit id]` (reset your merges) - `git rebase master maven_indexer` (if there are conflicts, fix them, then, add them, `rebase --continue`) - `git push origin maven_indexer` (probably, need `-f` option to overwrite. i.e. `git push -f origin maven_indexer`) Anyone, Are these OK? ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          651. arusinha opened a new pull request #209: [NETBEANS-54] Module Review o.apache.commons.lang URL: https://github.com/apache/incubator-netbeans/pull/209 Added maven coordinate for external resource commons-lang-2.6.jar ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          652. arusinha opened a new pull request #210: [NETBEANS-54] Module Review o.apache.commons.codec URL: https://github.com/apache/incubator-netbeans/pull/210 Added maven coordinate for external resource commons-codec-1.3.jar ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          653. geertjanw commented on issue #209: [NETBEANS-54] Module Review o.apache.commons.lang URL: https://github.com/apache/incubator-netbeans/pull/209#issuecomment-340720955 Looks good, thanks a lot. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          654. borxa closed pull request #208: [NETBEANS-54] Module Review refactoring.java URL: https://github.com/apache/incubator-netbeans/pull/208 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/resources/Class.java.template b/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/resources/Class.java.template index eadb04611..de7967234 100644 --- a/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/resources/Class.java.template +++ b/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/resources/Class.java.template @@ -1,3 +1,23 @@ +<#-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> <#assign licenseLast = " */"> diff --git a/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/resources/license-default.txt b/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/resources/license-default.txt index 7b7b68d84..6d4afc2da 100644 --- a/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/resources/license-default.txt +++ b/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/resources/license-default.txt @@ -1,3 +1,23 @@ +<#-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <#if licenseFirst??> ${licenseFirst} </#if> ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          655. borxa opened a new pull request #211: [NETBEANS-54] Module Review refactoring.java URL: https://github.com/apache/incubator-netbeans/pull/211 Add license to freemarker files: - Class.java.template - license-default.txt ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          656. arusinha opened a new pull request #212: [NETBEANS-54] Module Review o.apache.commons.logging URL: https://github.com/apache/incubator-netbeans/pull/212 Added maven coordinate for external resource commons-logging-1.1.1.jar Hash is changed as per the jar present in maven repository ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          657. matthiasblaesing closed pull request #163: [NETBEANS-54] Module Review maven.indexer URL: https://github.com/apache/incubator-netbeans/pull/163 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/maven.indexer/external/binaries-list b/maven.indexer/external/binaries-list index 16be5dd22..0527a4b99 100644 --- a/maven.indexer/external/binaries-list +++ b/maven.indexer/external/binaries-list @@ -15,8 +15,8 @@ # specific language governing permissions and limitations # under the License. 627EC612B8D50EE42C2D0F13DF5476E26D696634 indexer-core-6.0-SNAPSHOT-patched.jar -20540C6347259F35A0D264605B22CE2A13917066 lucene-core-5.5.3.jar -D276E74D57C64ED5F9A09A48DA05B75555E8709A lucene-highlighter-5.5.3.jar -E2452203D2C44CAC5AC42B34E5DCC0A44BF29A53 lucene-queryparser-5.5.3.jar -CF734AB72813AF33DC1544CE61ABC5C17B9D35E9 lucene-analyzers-common-5.5.3.jar -479C1E06DB31C432330183F5CAE684163F186146 javax.annotation-api-1.2.jar +20540C6347259F35A0D264605B22CE2A13917066 org.apache.lucene:lucene-core:5.5.3 +D276E74D57C64ED5F9A09A48DA05B75555E8709A org.apache.lucene:lucene-highlighter:5.5.3 +E2452203D2C44CAC5AC42B34E5DCC0A44BF29A53 org.apache.lucene:lucene-queryparser:5.5.3 +CF734AB72813AF33DC1544CE61ABC5C17B9D35E9 org.apache.lucene:lucene-analyzers-common:5.5.3 +479C1E06DB31C432330183F5CAE684163F186146 javax.annotation:javax.annotation-api:1.2 diff --git a/maven.indexer/external/mvn-indexer.patch b/maven.indexer/external/mvn-indexer.patch index 1e36ec2a4..7e0d35c7c 100644 --- a/maven.indexer/external/mvn-indexer.patch +++ b/maven.indexer/external/mvn-indexer.patch @@ -1,3 +1,21 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ diff --git a/indexer-cli/src/main/java/org/apache/maven/index/cli/NexusIndexerCli.java b/indexer-cli/src/main/java/org/apache/maven/index/cli/NexusIndexerCli.java index 9f33f67..e57a2a7 100644 --- a/indexer-cli/src/main/java/org/apache/maven/index/cli/NexusIndexerCli.java diff --git a/nbbuild/build.xml b/nbbuild/build.xml index cf5dc9eda..fa966b6f1 100644 --- a/nbbuild/build.xml +++ b/nbbuild/build.xml @@ -2018,6 +2018,7 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <exclude name="languages.yaml/src/org/netbeans/modules/languages/yaml/*.yml" /> <!--Files used in GUI as sample/starting point--> <exclude name="lib.uihandler/test/unit/src/**" /> <!--test data--> <exclude name="maven.htmlui/src/org/netbeans/modules/maven/htmlui/UIDefaults" /> <!-- config file with no place for license header--> + <exclude name="maven.indexer/external/NOTICE-patched-indexer-core-6.0.0" /> <!--no degree of creativity--> <exclude name="mercurial/src/org/netbeans/modules/mercurial/util/log*" /> <!-- user templates for mercurial commits, etc. --> <exclude name="nbbuild/netbeans/**" /> <exclude name="nbbuild/testuserdir/**" /> ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          658. matthiasblaesing commented on issue #163: [NETBEANS-54] Module Review maven.indexer URL: https://github.com/apache/incubator-netbeans/pull/163#issuecomment-340740005 Merged - thank you. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          659. matthiasblaesing commented on issue #212: [NETBEANS-54] Module Review o.apache.commons.logging URL: https://github.com/apache/incubator-netbeans/pull/212#issuecomment-340874798 commons-logging has a notice file, that should be included in the distribution. See for an example here: https://github.com/apache/incubator-netbeans/commit/a204dcca4b7bd99954e6e67a0331ec172542332c ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          660. matthiasblaesing commented on issue #210: [NETBEANS-54] Module Review o.apache.commons.codec URL: https://github.com/apache/incubator-netbeans/pull/210#issuecomment-340875149 commons-codec has a notice file, that should be included in the distribution. See for an example here: https://github.com/apache/incubator-netbeans/commit/a204dcca4b7bd99954e6e67a0331ec172542332c ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          661. matthiasblaesing commented on issue #209: [NETBEANS-54] Module Review o.apache.commons.lang URL: https://github.com/apache/incubator-netbeans/pull/209#issuecomment-340875562 commons-lang has a notice file, that should be included in the distribution. See for an example here: https://github.com/apache/incubator-netbeans/commit/a204dcca4b7bd99954e6e67a0331ec172542332c ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          662. geertjanw commented on issue #211: [NETBEANS-54] Module Review refactoring.java URL: https://github.com/apache/incubator-netbeans/pull/211#issuecomment-341092126 Thanks, merging. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          663. geertjanw closed pull request #211: [NETBEANS-54] Module Review refactoring.java URL: https://github.com/apache/incubator-netbeans/pull/211 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/resources/Class.java.template b/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/resources/Class.java.template index eadb04611..de7967234 100644 --- a/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/resources/Class.java.template +++ b/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/resources/Class.java.template @@ -1,3 +1,23 @@ +<#-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> <#assign licenseLast = " */"> diff --git a/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/resources/license-default.txt b/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/resources/license-default.txt index 7b7b68d84..6d4afc2da 100644 --- a/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/resources/license-default.txt +++ b/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/resources/license-default.txt @@ -1,3 +1,23 @@ +<#-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <#if licenseFirst??> ${licenseFirst} </#if> ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          664. geertjanw opened a new pull request #218: [NETBEANS-54] Module Review xml.jaxb URL: https://github.com/apache/incubator-netbeans/pull/218 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          665. geertjanw opened a new pull request #219: [NETBEANS-54] Module Review websvc.saas.codegen.java URL: https://github.com/apache/incubator-netbeans/pull/219 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          666. geertjanw opened a new pull request #220: [NETBEANS-54] Module Review performance URL: https://github.com/apache/incubator-netbeans/pull/220 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          667. geertjanw commented on issue #42: [NETBEANS-54] Module Review editor URL: https://github.com/apache/incubator-netbeans/pull/42#issuecomment-341365224 Or is there a problem when these files are relicensed, e.g., tests fail? ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          668. arusinha commented on issue #210: [NETBEANS-54] Module Review o.apache.commons.codec URL: https://github.com/apache/incubator-netbeans/pull/210#issuecomment-341368497 Added the Notice file from http://svn.apache.org/repos/asf/commons/proper/codec/tags/CODEC_1_3/NOTICE.txt ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          669. geertjanw opened a new pull request #221: [NETBEANS-54] adding license headers to uml files in openide.windows URL: https://github.com/apache/incubator-netbeans/pull/221 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          670. arusinha commented on issue #212: [NETBEANS-54] Module Review o.apache.commons.logging URL: https://github.com/apache/incubator-netbeans/pull/212#issuecomment-341370862 Added commons.logging notice from https://svn.apache.org/repos/asf/commons/proper/logging/tags/commons-logging-1.1.1/NOTICE.txt ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          671. geertjanw opened a new pull request #222: [NETBEANS-54] Module Review javahelp URL: https://github.com/apache/incubator-netbeans/pull/222 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          672. geertjanw opened a new pull request #223: [NETBEANS-54] Module Review libs.nbi.ant URL: https://github.com/apache/incubator-netbeans/pull/223 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          673. arusinha commented on issue #209: [NETBEANS-54] Module Review o.apache.commons.lang URL: https://github.com/apache/incubator-netbeans/pull/209#issuecomment-341375126 1. Added notice file from https://svn.apache.org/repos/asf/commons/_moved_to_git/lang/tags/LANG_2_6/NOTICE.txt 2. Also license filename was changed to common-lang-2.6-license.txt ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          674. geertjanw opened a new pull request #224: [NETBEANS-54] adding licenses to uml files in openide.nodes URL: https://github.com/apache/incubator-netbeans/pull/224 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          675. geertjanw opened a new pull request #225: [NETBEANS-54] exclude .ser files via Rat exclusions URL: https://github.com/apache/incubator-netbeans/pull/225 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          676. geertjanw opened a new pull request #226: [NETBEANS-54] adding license headers to UML files in openide.options URL: https://github.com/apache/incubator-netbeans/pull/226 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          677. geertjanw opened a new pull request #227: [NETBEANS-54] adding license headers to various files in nbbuild URL: https://github.com/apache/incubator-netbeans/pull/227 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          678. matthiasblaesing commented on issue #212: [NETBEANS-54] Module Review o.apache.commons.logging URL: https://github.com/apache/incubator-netbeans/pull/212#issuecomment-341408121 Thank you - looks good. Merging! ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          679. matthiasblaesing closed pull request #212: [NETBEANS-54] Module Review o.apache.commons.logging URL: https://github.com/apache/incubator-netbeans/pull/212 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/o.apache.commons.logging/external/binaries-list b/o.apache.commons.logging/external/binaries-list index fd43abf6f..5f562869c 100644 --- a/o.apache.commons.logging/external/binaries-list +++ b/o.apache.commons.logging/external/binaries-list @@ -14,4 +14,4 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -2D859791FBF7D880591864BD4004D8442A8A3B81 commons-logging-1.1.1.jar +5043BFEBC3DB072ED80FBD362E7CAF00E885D8AE commons-logging:commons-logging:1.1.1 diff --git a/o.apache.commons.logging/external/commons-logging-1.1.1-notice.txt b/o.apache.commons.logging/external/commons-logging-1.1.1-notice.txt new file mode 100644 index 000000000..3d948f5a6 --- /dev/null +++ b/o.apache.commons.logging/external/commons-logging-1.1.1-notice.txt @@ -0,0 +1,5 @@ +Apache Commons Logging +Copyright 2003-2007 The Apache Software Foundation + +This product includes software developed by +The Apache Software Foundation (http://www.apache.org/). ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          680. matthiasblaesing commented on issue #209: [NETBEANS-54] Module Review o.apache.commons.lang URL: https://github.com/apache/incubator-netbeans/pull/209#issuecomment-341408438 Thanks for ensuring correct naming! ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          681. matthiasblaesing closed pull request #209: [NETBEANS-54] Module Review o.apache.commons.lang URL: https://github.com/apache/incubator-netbeans/pull/209 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/o.apache.commons.lang/external/binaries-list b/o.apache.commons.lang/external/binaries-list index 560390362..dd6121416 100644 --- a/o.apache.commons.lang/external/binaries-list +++ b/o.apache.commons.lang/external/binaries-list @@ -14,4 +14,4 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2 commons-lang-2.6.jar +0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2 commons-lang:commons-lang:2.6 diff --git a/o.apache.commons.lang/external/org.apache.commons.lang-2.6.0.v201404270220-license.txt b/o.apache.commons.lang/external/common-lang-2.6-license.txt similarity index 100% rename from o.apache.commons.lang/external/org.apache.commons.lang-2.6.0.v201404270220-license.txt rename to o.apache.commons.lang/external/common-lang-2.6-license.txt diff --git a/o.apache.commons.lang/external/common-lang-2.6-notice.txt b/o.apache.commons.lang/external/common-lang-2.6-notice.txt new file mode 100644 index 000000000..c0696a6c3 --- /dev/null +++ b/o.apache.commons.lang/external/common-lang-2.6-notice.txt @@ -0,0 +1,5 @@ +Apache Commons Lang +Copyright 2001-2011 The Apache Software Foundation + +This product includes software developed by +The Apache Software Foundation (http://www.apache.org/). \ No newline at end of file ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          682. matthiasblaesing closed pull request #210: [NETBEANS-54] Module Review o.apache.commons.codec URL: https://github.com/apache/incubator-netbeans/pull/210 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/o.apache.commons.codec/build.xml b/o.apache.commons.codec/build.xml index af4316748..20f87dffa 100644 --- a/o.apache.commons.codec/build.xml +++ b/o.apache.commons.codec/build.xml @@ -23,7 +23,7 @@ <import file="../nbbuild/templates/projectized.xml"/> <target name="jar"> <jar jarfile="${cluster}/${module.jar}"> - <zipfileset src="external/apache-commons-codec-1.3.jar"/> + <zipfileset src="external/commons-codec-1.3.jar"/> <manifest> <attribute name="Bundle-SymbolicName" value="org.apache.commons.codec"/> <attribute name="Bundle-Version" value="1.3.0"/> diff --git a/o.apache.commons.codec/external/binaries-list b/o.apache.commons.codec/external/binaries-list index b34abc540..9caf2fac6 100644 --- a/o.apache.commons.codec/external/binaries-list +++ b/o.apache.commons.codec/external/binaries-list @@ -14,4 +14,4 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -FD32786786E2ADB664D5ECC965DA47629DCA14BA apache-commons-codec-1.3.jar +FD32786786E2ADB664D5ECC965DA47629DCA14BA commons-codec:commons-codec:1.3 diff --git a/o.apache.commons.codec/external/org.apache.commons.codec-1.3.0-license.txt b/o.apache.commons.codec/external/commons.codec-1.3-license.txt similarity index 100% rename from o.apache.commons.codec/external/org.apache.commons.codec-1.3.0-license.txt rename to o.apache.commons.codec/external/commons.codec-1.3-license.txt diff --git a/o.apache.commons.codec/external/commons.codec-1.3-notice.txt b/o.apache.commons.codec/external/commons.codec-1.3-notice.txt new file mode 100644 index 000000000..7196130f7 --- /dev/null +++ b/o.apache.commons.codec/external/commons.codec-1.3-notice.txt @@ -0,0 +1,2 @@ +This product includes software developed by +The Apache Software Foundation (http://www.apache.org/). \ No newline at end of file diff --git a/o.apache.commons.codec/nbproject/project.xml b/o.apache.commons.codec/nbproject/project.xml index 72f270a8e..19e85cb94 100644 --- a/o.apache.commons.codec/nbproject/project.xml +++ b/o.apache.commons.codec/nbproject/project.xml @@ -28,7 +28,7 @@ <public-packages/> <class-path-extension> <runtime-relative-path>org-apache-commons-codec.jar</runtime-relative-path> - <binary-origin>external/apache-commons-codec-1.3.jar</binary-origin> + <binary-origin>external/commons-codec-1.3.jar</binary-origin> </class-path-extension> </data> </configuration> ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          683. geertjanw opened a new pull request #228: [NETBEANS-54] Module Review jumpto URL: https://github.com/apache/incubator-netbeans/pull/228 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          684. geertjanw commented on issue #42: [NETBEANS-54] Module Review editor URL: https://github.com/apache/incubator-netbeans/pull/42#issuecomment-341431686 Reopening with the above question. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          685. vieiro opened a new pull request #42: [NETBEANS-54] Module Review editor URL: https://github.com/apache/incubator-netbeans/pull/42 - No external libraries. - Checked Rat report: added license to project files. Did NOT add license to editor/demosrc/README nor to the rest of test files. - Unit tests org.netbeans.editor.PlainDocumentCompatibilityRandomTest and org.netbeans.modules.editor.NbEditorToolBarTest fail (but they were also failing before this PR). - QA Tests should be run. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          686. geertjanw opened a new pull request #229: [NETBEANS-54] Module Review spi.navigator & spi.palette URL: https://github.com/apache/incubator-netbeans/pull/229 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          687. vieiro commented on issue #42: [NETBEANS-54] Module Review editor URL: https://github.com/apache/incubator-netbeans/pull/42#issuecomment-341436166 Will take a look at them tonight. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          688. geertjanw opened a new pull request #230: [NETBEANS-54] Module Review ide URL: https://github.com/apache/incubator-netbeans/pull/230 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          689. geertjanw opened a new pull request #231: [NETBEANS-54] Module Review jemmy URL: https://github.com/apache/incubator-netbeans/pull/231 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          690. geertjanw opened a new pull request #232: [NETBEANS-54] Module Review jellytools.platform URL: https://github.com/apache/incubator-netbeans/pull/232 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          691. vieiro opened a new pull request #233: [NETBEANS-54] Module Review o.eclipse.core.runtime URL: https://github.com/apache/incubator-netbeans/pull/233 - Added maven coordinates for the binary. - No other licensing issues found (but for manifest.mf, to be handled centrally). ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          692. geertjanw commented on issue #233: [NETBEANS-54] Module Review o.eclipse.core.runtime URL: https://github.com/apache/incubator-netbeans/pull/233#issuecomment-341592945 Thanks, looks good. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          693. junichi11 commented on a change in pull request #42: [NETBEANS-54] Module Review editor URL: https://github.com/apache/incubator-netbeans/pull/42#discussion_r148699327 ########## File path: nbbuild/build.xml ########## @@ -2002,6 +2002,14 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <exclude name="debugger.jpda/test/unit/src/org/netbeans/api/debugger/jpda/testapps/JspLineBreakpointApp.txt" /> <!-- test data --> <exclude name="diff/test/unit/src/org/netbeans/modules/diff/builtin/provider/*.txt" /> <!--test data--> <exclude name="diff/test/unit/src/org/netbeans/modules/diff/builtin/visualizer/data/**" /> <!--test data--> + <exclude name="editor/test/qa-functional/data/projects/editor_test/src/**.txt" /> <!-- test data --> + <exclude name="editor/test/qa-functional/data/**.pass" /> <!-- qa test data --> + <exclude name="editor/test/qa-functional/src/org/netbeans/test/editor/suites/keybindings/actions.txt" /> <!-- qa test data --> + <exclude name="editor/test/qa-functional/data/projects/editor_test/src/org/netbeans/test/editor/search/IncrementalSearchTest/**.txt" /> <!-- qa test data --> Review comment: This line is excluded with `<exclude name="*/test/qa-functional/data/**" />`. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          694. junichi11 commented on a change in pull request #42: [NETBEANS-54] Module Review editor URL: https://github.com/apache/incubator-netbeans/pull/42#discussion_r148699047 ########## File path: nbbuild/build.xml ########## @@ -2002,6 +2002,14 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <exclude name="debugger.jpda/test/unit/src/org/netbeans/api/debugger/jpda/testapps/JspLineBreakpointApp.txt" /> <!-- test data --> <exclude name="diff/test/unit/src/org/netbeans/modules/diff/builtin/provider/*.txt" /> <!--test data--> <exclude name="diff/test/unit/src/org/netbeans/modules/diff/builtin/visualizer/data/**" /> <!--test data--> + <exclude name="editor/test/qa-functional/data/projects/editor_test/src/**.txt" /> <!-- test data --> + <exclude name="editor/test/qa-functional/data/**.pass" /> <!-- qa test data --> Review comment: These two lines are excluded with `<exclude name="*/test/qa-functional/data/**" />`. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          695. junichi11 commented on a change in pull request #42: [NETBEANS-54] Module Review editor URL: https://github.com/apache/incubator-netbeans/pull/42#discussion_r148699900 ########## File path: nbbuild/build.xml ########## @@ -2002,6 +2002,14 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <exclude name="debugger.jpda/test/unit/src/org/netbeans/api/debugger/jpda/testapps/JspLineBreakpointApp.txt" /> <!-- test data --> <exclude name="diff/test/unit/src/org/netbeans/modules/diff/builtin/provider/*.txt" /> <!--test data--> <exclude name="diff/test/unit/src/org/netbeans/modules/diff/builtin/visualizer/data/**" /> <!--test data--> + <exclude name="editor/test/qa-functional/data/projects/editor_test/src/**.txt" /> <!-- test data --> + <exclude name="editor/test/qa-functional/data/**.pass" /> <!-- qa test data --> + <exclude name="editor/test/qa-functional/src/org/netbeans/test/editor/suites/keybindings/actions.txt" /> <!-- qa test data --> + <exclude name="editor/test/qa-functional/data/projects/editor_test/src/org/netbeans/test/editor/search/IncrementalSearchTest/**.txt" /> <!-- qa test data --> + <exclude name="editor/test/unit/src/org/netbeans/modules/editor/resources/**.xml" /> <!-- unit test data --> Review comment: I suggest `<exclude name="editor/test/unit/src/org/netbeans/modules/editor/resources/testAnnotation*.xml" />`. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          696. junichi11 commented on a change in pull request #232: [NETBEANS-54] Module Review jellytools.platform URL: https://github.com/apache/incubator-netbeans/pull/232#discussion_r148709253 ########## File path: jellytools.platform/src/org/netbeans/jellytools/version_info ########## @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. Review comment: This file is used as a manifest file. So, probably, the license header cannot be added. https://github.com/apache/incubator-netbeans/blob/7f1440637c74b193db41a9cc26437f94cb41c79c/jellytools.platform/src/org/netbeans/jellytools/JellyVersion.java#L73-L80 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          697. vieiro commented on issue #42: [NETBEANS-54] Module Review editor URL: https://github.com/apache/incubator-netbeans/pull/42#issuecomment-341626789 Thanks, guys, for your reviews. I'll do a new PR tonight/EU Time. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          698. geertjanw closed pull request #222: [NETBEANS-54] Module Review javahelp URL: https://github.com/apache/incubator-netbeans/pull/222 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/javahelp/src/org/netbeans/modules/javahelp/resources/favorites_2_0.dtd b/javahelp/src/org/netbeans/modules/javahelp/resources/favorites_2_0.dtd index 526b34457..a892681a9 100644 --- a/javahelp/src/org/netbeans/modules/javahelp/resources/favorites_2_0.dtd +++ b/javahelp/src/org/netbeans/modules/javahelp/resources/favorites_2_0.dtd @@ -1,10 +1,24 @@ <?xml version="1.0" encoding="UTF-8" ?> -<!-- - This is the DTD for favorites - Copyright (c) 2001 Sun Microsystems +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. - @(#)favorites_2_0.dtd 1.2 03/19/02 --> diff --git a/javahelp/src/org/netbeans/modules/javahelp/resources/helpset_1_0.dtd b/javahelp/src/org/netbeans/modules/javahelp/resources/helpset_1_0.dtd index bc743bb57..deeee37e3 100644 --- a/javahelp/src/org/netbeans/modules/javahelp/resources/helpset_1_0.dtd +++ b/javahelp/src/org/netbeans/modules/javahelp/resources/helpset_1_0.dtd @@ -1,10 +1,24 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!-- - This is the DTD for helpset - Copyright (c) 1998,1999 Sun Microsystems +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. - @(#)helpset_1_0.dtd 1.5 01/14/99 --> diff --git a/javahelp/src/org/netbeans/modules/javahelp/resources/helpset_2_0.dtd b/javahelp/src/org/netbeans/modules/javahelp/resources/helpset_2_0.dtd index f59f220fa..e2e911791 100644 --- a/javahelp/src/org/netbeans/modules/javahelp/resources/helpset_2_0.dtd +++ b/javahelp/src/org/netbeans/modules/javahelp/resources/helpset_2_0.dtd @@ -1,10 +1,24 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!-- - This is the DTD for helpset - Copyright (c) 1998,1999 Sun Microsystems +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. - @(#)helpset_2_0.dtd 1.5 06/05/03 --> diff --git a/javahelp/src/org/netbeans/modules/javahelp/resources/index_1_0.dtd b/javahelp/src/org/netbeans/modules/javahelp/resources/index_1_0.dtd index 7f7b1ab67..d2266cb8d 100644 --- a/javahelp/src/org/netbeans/modules/javahelp/resources/index_1_0.dtd +++ b/javahelp/src/org/netbeans/modules/javahelp/resources/index_1_0.dtd @@ -1,10 +1,24 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!-- - This is the DTD for Index - Copyright (c) 1998 Sun Microsystems +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. - @(#)index_1_0.dtd 1.2 01/03/99 --> diff --git a/javahelp/src/org/netbeans/modules/javahelp/resources/index_2_0.dtd b/javahelp/src/org/netbeans/modules/javahelp/resources/index_2_0.dtd index 4b51dafe2..06ab255a3 100644 --- a/javahelp/src/org/netbeans/modules/javahelp/resources/index_2_0.dtd +++ b/javahelp/src/org/netbeans/modules/javahelp/resources/index_2_0.dtd @@ -1,10 +1,24 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!-- - This is the DTD for Index - Copyright (c) 1998 Sun Microsystems +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. - @(#)index_2_0.dtd 1.4 06/05/03 --> diff --git a/javahelp/src/org/netbeans/modules/javahelp/resources/map_1_0.dtd b/javahelp/src/org/netbeans/modules/javahelp/resources/map_1_0.dtd index dd4d13db2..637b0eeb9 100644 --- a/javahelp/src/org/netbeans/modules/javahelp/resources/map_1_0.dtd +++ b/javahelp/src/org/netbeans/modules/javahelp/resources/map_1_0.dtd @@ -1,10 +1,23 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!-- - This is the DTD for (flat) Maps - Copyright (c) 1998 Sun Microsystems - - @(#)map_1_0.dtd 1.1 12/17/98 +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. --> diff --git a/javahelp/src/org/netbeans/modules/javahelp/resources/map_2_0.dtd b/javahelp/src/org/netbeans/modules/javahelp/resources/map_2_0.dtd index d241d8374..cab8725c1 100644 --- a/javahelp/src/org/netbeans/modules/javahelp/resources/map_2_0.dtd +++ b/javahelp/src/org/netbeans/modules/javahelp/resources/map_2_0.dtd @@ -1,10 +1,23 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!-- - This is the DTD for (flat) Maps - Copyright (c) 1998 Sun Microsystems - - @(#)map_2_0.dtd 1.1 03/19/02 +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. --> diff --git a/javahelp/src/org/netbeans/modules/javahelp/resources/toc_1_0.dtd b/javahelp/src/org/netbeans/modules/javahelp/resources/toc_1_0.dtd index a5e9337b8..96bc0d813 100644 --- a/javahelp/src/org/netbeans/modules/javahelp/resources/toc_1_0.dtd +++ b/javahelp/src/org/netbeans/modules/javahelp/resources/toc_1_0.dtd @@ -1,10 +1,24 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!-- - This is the DTD for TOC - Copyright (c) 1998 Sun Microsystems +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. - @(#)toc_1_0.dtd 1.3 01/03/99 --> diff --git a/javahelp/src/org/netbeans/modules/javahelp/resources/toc_2_0.dtd b/javahelp/src/org/netbeans/modules/javahelp/resources/toc_2_0.dtd index d8b6908b3..646864dd1 100644 --- a/javahelp/src/org/netbeans/modules/javahelp/resources/toc_2_0.dtd +++ b/javahelp/src/org/netbeans/modules/javahelp/resources/toc_2_0.dtd @@ -1,10 +1,24 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!-- - This is the DTD for TOC - Copyright (c) 1998 Sun Microsystems +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. - @(#)toc_2_0.dtd 1.4 06/05/03 --> ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          699. geertjanw closed pull request #231: [NETBEANS-54] Module Review jemmy URL: https://github.com/apache/incubator-netbeans/pull/231 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/jemmy/CHANGES b/jemmy/CHANGES index c81e834b3..d2d9b6100 100644 --- a/jemmy/CHANGES +++ b/jemmy/CHANGES @@ -1,44 +1,20 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. -# -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Contributor(s): +# http://www.apache.org/licenses/LICENSE-2.0 # -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + #VERSION 1.0.1 1. Jemmy versioning has been started. diff --git a/jemmy/src/org/netbeans/modules/jemmy/idemodule/Bundle.properties b/jemmy/src/org/netbeans/modules/jemmy/idemodule/Bundle.properties index 3ca118a78..2b3297369 100644 --- a/jemmy/src/org/netbeans/modules/jemmy/idemodule/Bundle.properties +++ b/jemmy/src/org/netbeans/modules/jemmy/idemodule/Bundle.properties @@ -1,45 +1,19 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. +# http://www.apache.org/licenses/LICENSE-2.0 # -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# Contributor(s): -# -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. -# Author: <a href="mailto:adam.sotona@sun.com">Adam Sotona</a> +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. # Module properties: OpenIDE-Module-Name=Jemmy diff --git a/jemmy/test/unit/gui_resource b/jemmy/test/unit/gui_resource index 78b009d4f..bbd07f965 100644 --- a/jemmy/test/unit/gui_resource +++ b/jemmy/test/unit/gui_resource @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. ######################################################### #Forte4Java #Windows diff --git a/jemmy/test/unit/jemmy.timeouts b/jemmy/test/unit/jemmy.timeouts index dd6d2a68e..54c5ea78e 100644 --- a/jemmy/test/unit/jemmy.timeouts +++ b/jemmy/test/unit/jemmy.timeouts @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. Waiter.WaitingTime=111111 QueueTool.WaitQueueEmptyTimeout=10000 FrameWaiter.AfterFrameTimeout=100 diff --git a/jemmy/test/unit/testlist b/jemmy/test/unit/testlist index 3806c12d3..78bc8e308 100644 --- a/jemmy/test/unit/testlist +++ b/jemmy/test/unit/testlist @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. org.netbeans.jemmy.testing.jemmy_001 org.netbeans.jemmy.testing.jemmy_002 org.netbeans.jemmy.testing.jemmy_003 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          700. geertjanw closed pull request #229: [NETBEANS-54] Module Review spi.navigator & spi.palette URL: https://github.com/apache/incubator-netbeans/pull/229 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/spi.navigator/src/org/netbeans/modules/navigator/resources/navigator.wsmode b/spi.navigator/src/org/netbeans/modules/navigator/resources/navigator.wsmode index 3efca0fb9..0ecb6e2b6 100644 --- a/spi.navigator/src/org/netbeans/modules/navigator/resources/navigator.wsmode +++ b/spi.navigator/src/org/netbeans/modules/navigator/resources/navigator.wsmode @@ -1,5 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!DOCTYPE mode PUBLIC "-//NetBeans//DTD Mode Properties 2.0//EN" "http://www.netbeans.org/dtds/mode-properties2_0.dtd"> diff --git a/spi.palette/src/org/netbeans/modules/palette/resources/commonpalette.wsmode b/spi.palette/src/org/netbeans/modules/palette/resources/commonpalette.wsmode index f3e79db85..0933fd776 100644 --- a/spi.palette/src/org/netbeans/modules/palette/resources/commonpalette.wsmode +++ b/spi.palette/src/org/netbeans/modules/palette/resources/commonpalette.wsmode @@ -1,5 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!DOCTYPE mode PUBLIC "-//NetBeans//DTD Mode Properties 2.0//EN" "http://www.netbeans.org/dtds/mode-properties2_0.dtd"> ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          701. geertjanw closed pull request #228: [NETBEANS-54] Module Review jumpto URL: https://github.com/apache/incubator-netbeans/pull/228 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/jumpto/nbproject/project.xml b/jumpto/nbproject/project.xml index ff9ec269d..31b1bd0e5 100644 --- a/jumpto/nbproject/project.xml +++ b/jumpto/nbproject/project.xml @@ -19,52 +19,6 @@ under the License. --> -<!-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. - -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. - - -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" - -Contributor(s): - -The Original Software is the Accelerators module. -The Initial Developer of the Original Software is Andrei Badea. -Portions Copyright 2005-2006 Andrei Badea. -All Rights Reserved. - -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - ---> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.apisupport.project</type> <configuration> diff --git a/jumpto/src/org/netbeans/modules/jumpto/file/Bundle.properties b/jumpto/src/org/netbeans/modules/jumpto/file/Bundle.properties index e51e9b20d..655f24ef8 100644 --- a/jumpto/src/org/netbeans/modules/jumpto/file/Bundle.properties +++ b/jumpto/src/org/netbeans/modules/jumpto/file/Bundle.properties @@ -1,45 +1,19 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. +# http://www.apache.org/licenses/LICENSE-2.0 # -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# Contributor(s): -# -# The Original Software is the Accelerators module. -# The Initial Developer of the Original Software is Andrei Badea. -# Portions Copyright 2005-2006 Andrei Badea. -# All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. # FileSearchAction CTL_FileSearchAction=Go to &File... diff --git a/jumpto/src/org/netbeans/modules/jumpto/file/FileSearchAction.java b/jumpto/src/org/netbeans/modules/jumpto/file/FileSearchAction.java index 56875ce9e..1a451510e 100644 --- a/jumpto/src/org/netbeans/modules/jumpto/file/FileSearchAction.java +++ b/jumpto/src/org/netbeans/modules/jumpto/file/FileSearchAction.java @@ -1,47 +1,20 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * Contributor(s): - * - * The Original Software is the Accelerators module. - * The Initial Developer of the Original Software is Andrei Badea. - * Portions Copyright 2005-2006 Andrei Badea. - * All Rights Reserved. +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. + * http://www.apache.org/licenses/LICENSE-2.0 * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ /* * Contributor(s): markiewb@netbeans.org diff --git a/jumpto/src/org/netbeans/modules/jumpto/file/FileSearchOptions.java b/jumpto/src/org/netbeans/modules/jumpto/file/FileSearchOptions.java index 8371c72fc..bce4f58df 100644 --- a/jumpto/src/org/netbeans/modules/jumpto/file/FileSearchOptions.java +++ b/jumpto/src/org/netbeans/modules/jumpto/file/FileSearchOptions.java @@ -1,47 +1,20 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * Contributor(s): - * - * The Original Software is the Accelerators module. - * The Initial Developer of the Original Software is Andrei Badea. - * Portions Copyright 2005-2006 Andrei Badea. - * All Rights Reserved. +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. + * http://www.apache.org/licenses/LICENSE-2.0 * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.netbeans.modules.jumpto.file; diff --git a/jumpto/src/org/netbeans/modules/jumpto/resources/Bundle.properties b/jumpto/src/org/netbeans/modules/jumpto/resources/Bundle.properties index a0f3a9894..5e751286c 100644 --- a/jumpto/src/org/netbeans/modules/jumpto/resources/Bundle.properties +++ b/jumpto/src/org/netbeans/modules/jumpto/resources/Bundle.properties @@ -1,45 +1,19 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. +# http://www.apache.org/licenses/LICENSE-2.0 # -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# Contributor(s): -# -# The Original Software is the Accelerators module. -# The Initial Developer of the Original Software is Andrei Badea. -# Portions Copyright 2005-2006 Andrei Badea. -# All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. OpenIDE-Module-Name=Jump To OpenIDE-Module-Display-Category=Editing diff --git a/jumpto/src/org/netbeans/modules/jumpto/resources/layer.xml b/jumpto/src/org/netbeans/modules/jumpto/resources/layer.xml index 280994247..3edc96740 100644 --- a/jumpto/src/org/netbeans/modules/jumpto/resources/layer.xml +++ b/jumpto/src/org/netbeans/modules/jumpto/resources/layer.xml @@ -1,48 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 - -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" - -Contributor(s): - -The Original Software is the Accelerators module. -The Initial Developer of the Original Software is Andrei Badea. -Portions Copyright 2005-2006 Andrei Badea. -All Rights Reserved. - -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. --> <!-- diff --git a/jumpto/test/unit/src/org/netbeans/modules/jumpto/common/HighlightingNameFormatterTest.java b/jumpto/test/unit/src/org/netbeans/modules/jumpto/common/HighlightingNameFormatterTest.java index 684f4923a..22e69241a 100644 --- a/jumpto/test/unit/src/org/netbeans/modules/jumpto/common/HighlightingNameFormatterTest.java +++ b/jumpto/test/unit/src/org/netbeans/modules/jumpto/common/HighlightingNameFormatterTest.java @@ -1,44 +1,20 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2012 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * Contributor(s): - * markiewb@netbeans.org + * http://www.apache.org/licenses/LICENSE-2.0 * - * Portions Copyrighted 2012 Sun Microsystems, Inc. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.netbeans.modules.jumpto.common; ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          702. geertjanw closed pull request #230: [NETBEANS-54] Module Review ide URL: https://github.com/apache/incubator-netbeans/pull/230 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/ide/bluejl10n.list b/ide/bluejl10n.list index bb276dc12..40488f663 100644 --- a/ide/bluejl10n.list +++ b/ide/bluejl10n.list @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ide/bluej-suite/branding/**/Bundle.properties ide/bluej-suite/branding/**/*.gif ide/bluej-suite/bluej-welcome/**/Bundle.properties diff --git a/ide/launcher/macosx/NetBeansLauncher/English.lproj/MainMenu.nib/info.nib b/ide/launcher/macosx/NetBeansLauncher/English.lproj/MainMenu.nib/info.nib index e0da0549c..ed3fb27a8 100644 --- a/ide/launcher/macosx/NetBeansLauncher/English.lproj/MainMenu.nib/info.nib +++ b/ide/launcher/macosx/NetBeansLauncher/English.lproj/MainMenu.nib/info.nib @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> diff --git a/ide/launcher/netbeans.clusters b/ide/launcher/netbeans.clusters index 4e2e8859a..2ea6c1cb9 100644 --- a/ide/launcher/netbeans.clusters +++ b/ide/launcher/netbeans.clusters @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + # platform cluster first platform # application cluster second diff --git a/ide/launcher/netbeans.conf b/ide/launcher/netbeans.conf index e8620d591..dbf8640f1 100644 --- a/ide/launcher/netbeans.conf +++ b/ide/launcher/netbeans.conf @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# # Default locations of userdir and cachedir: # (http://wiki.netbeans.org/FaqWhatIsUserdir) # diff --git a/ide/launcher/windows/.dep.inc b/ide/launcher/windows/.dep.inc index 4560e55af..08c0aeb8f 100644 --- a/ide/launcher/windows/.dep.inc +++ b/ide/launcher/windows/.dep.inc @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# # This code depends on make tool being used DEPFILES=$(wildcard $(addsuffix .d, ${OBJECTFILES})) ifneq (${DEPFILES},) ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          703. geertjanw closed pull request #223: [NETBEANS-54] Module Review libs.nbi.ant URL: https://github.com/apache/incubator-netbeans/pull/223 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/libs.nbi.ant/stub/ext/components/products/helloworld/src/org/mycompany/wizard/panels/Bundle.properties b/libs.nbi.ant/stub/ext/components/products/helloworld/src/org/mycompany/wizard/panels/Bundle.properties index 1c1b64d4a..96cb31b91 100644 --- a/libs.nbi.ant/stub/ext/components/products/helloworld/src/org/mycompany/wizard/panels/Bundle.properties +++ b/libs.nbi.ant/stub/ext/components/products/helloworld/src/org/mycompany/wizard/panels/Bundle.properties @@ -1,41 +1,19 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved. +# http://www.apache.org/licenses/LICENSE-2.0 # -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. -# -# Contributor(s): -# HelloWorldPanel.java +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. P.title={product-name} Installation P.description=Choose destination folder. P.destination.label.text=&Install {product-name} to: diff --git a/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/utils/applications/Bundle.properties b/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/utils/applications/Bundle.properties index 56afab3a2..33168547e 100644 --- a/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/utils/applications/Bundle.properties +++ b/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/utils/applications/Bundle.properties @@ -1,41 +1,19 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved. +# http://www.apache.org/licenses/LICENSE-2.0 # -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. # -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. -# -# Contributor(s): -############################################################################ # NetBeansRCPUtils.java - NU.error.cannot.get.userdir=Can`t get application userdir from {0} diff --git a/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/wizard/components/sequences/Bundle.properties b/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/wizard/components/sequences/Bundle.properties index 57bd06c16..69c1e5866 100644 --- a/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/wizard/components/sequences/Bundle.properties +++ b/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/wizard/components/sequences/Bundle.properties @@ -1,41 +1,20 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved. +# http://www.apache.org/licenses/LICENSE-2.0 # -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. # -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. -# -# Contributor(s): -##################################################################################### # MainSequence.java MS.IA.title=Installation MS.IA.description=Please wait while the installer installs {product-name}. diff --git a/libs.nbi.ant/stub/template.xml b/libs.nbi.ant/stub/template.xml index e324b15b7..8b05d454d 100644 --- a/libs.nbi.ant/stub/template.xml +++ b/libs.nbi.ant/stub/template.xml @@ -1,3 +1,23 @@ +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project name="build installers" default="build" basedir="."> <!--<property file="${basedir}/template.properties"/>--> ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          704. geertjanw closed pull request #219: [NETBEANS-54] Module Review websvc.saas.codegen.java URL: https://github.com/apache/incubator-netbeans/pull/219 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/Bundle.properties b/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/Bundle.properties index 4043c5fb8..ad582864b 100644 --- a/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/Bundle.properties +++ b/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/Bundle.properties @@ -1,45 +1,19 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. +# http://www.apache.org/licenses/LICENSE-2.0 # -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# Contributor(s): -# -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. -# Sample ResourceBundle properties file +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. OpenIDE-Module-Name=SaaS Services Code Generation for Java OpenIDE-Module-Display-Category=Java diff --git a/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/ApiKeyAuthenticator.template b/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/ApiKeyAuthenticator.template index 95402f981..4904eb515 100644 --- a/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/ApiKeyAuthenticator.template +++ b/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/ApiKeyAuthenticator.template @@ -1,4 +1,23 @@ -<#-- FreeMarker template (see http://freemarker.org/) --> +<#-- FreeMarker template (see http://freemarker.org/) + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> <#assign licenseLast = " */"> diff --git a/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/HttpBasicAuthenticator.template b/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/HttpBasicAuthenticator.template index f68c9724b..04cb19f70 100644 --- a/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/HttpBasicAuthenticator.template +++ b/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/HttpBasicAuthenticator.template @@ -1,4 +1,23 @@ -<#-- FreeMarker template (see http://freemarker.org/) --> +<#-- FreeMarker template (see http://freemarker.org/) + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> <#assign licenseLast = " */"> diff --git a/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/RestConnection.template b/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/RestConnection.template index f570264e4..f2e26a59f 100644 --- a/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/RestConnection.template +++ b/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/RestConnection.template @@ -1,4 +1,23 @@ -<#-- FreeMarker template (see http://freemarker.org/) --> +<#-- FreeMarker template (see http://freemarker.org/) + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> <#assign licenseLast = " */"> diff --git a/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/RestResponse.template b/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/RestResponse.template index c4364b93d..e0a698d08 100644 --- a/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/RestResponse.template +++ b/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/RestResponse.template @@ -1,4 +1,23 @@ -<#-- FreeMarker template (see http://freemarker.org/) --> +<#-- FreeMarker template (see http://freemarker.org/) + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> <#assign licenseLast = " */"> diff --git a/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/SaasService.template b/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/SaasService.template index b29f79956..d1736f36c 100644 --- a/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/SaasService.template +++ b/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/SaasService.template @@ -1,4 +1,23 @@ -<#-- FreeMarker template (see http://freemarker.org/) --> +<#-- FreeMarker template (see http://freemarker.org/) + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> <#assign licenseLast = " */"> diff --git a/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/SessionKeyAuthenticator.template b/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/SessionKeyAuthenticator.template index 5b1f1132a..2da0f0c80 100644 --- a/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/SessionKeyAuthenticator.template +++ b/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/SessionKeyAuthenticator.template @@ -1,4 +1,23 @@ -<#-- FreeMarker template (see http://freemarker.org/) --> +<#-- FreeMarker template (see http://freemarker.org/) + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> <#assign licenseLast = " */"> diff --git a/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/SignedUrlAuthenticator.template b/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/SignedUrlAuthenticator.template index 3330c2467..4e0dfa10b 100644 --- a/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/SignedUrlAuthenticator.template +++ b/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/SignedUrlAuthenticator.template @@ -1,4 +1,23 @@ -<#-- FreeMarker template (see http://freemarker.org/) --> +<#-- FreeMarker template (see http://freemarker.org/) + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> <#assign licenseLast = " */"> ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          705. geertjanw commented on issue #218: [NETBEANS-54] Module Review xml.jaxb URL: https://github.com/apache/incubator-netbeans/pull/218#issuecomment-341673939 Thanks a lot for the review, makes sense, will do. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          706. matthiasblaesing closed pull request #233: [NETBEANS-54] Module Review o.eclipse.core.runtime URL: https://github.com/apache/incubator-netbeans/pull/233 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/o.eclipse.core.runtime/external/binaries-list b/o.eclipse.core.runtime/external/binaries-list index 071544d04..cb8539372 100644 --- a/o.eclipse.core.runtime/external/binaries-list +++ b/o.eclipse.core.runtime/external/binaries-list @@ -14,4 +14,4 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -D2D2105B1E3C9E2FA6240AD088237A57590DDA8D org.eclipse.core.runtime-3.7.0_nosignature.jar +6658C235056134F7E86295E751129508802D71F2 org.eclipse.core:org.eclipse.core.runtime:3.7.0 diff --git a/o.eclipse.core.runtime/nbproject/project.properties b/o.eclipse.core.runtime/nbproject/project.properties index 611e0becf..dd023c945 100644 --- a/o.eclipse.core.runtime/nbproject/project.properties +++ b/o.eclipse.core.runtime/nbproject/project.properties @@ -14,6 +14,6 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -release.external/org.eclipse.core.runtime-3.7.0_nosignature.jar=modules/org-eclipse-core-runtime.jar +release.external/org.eclipse.core.runtime-3.7.0.jar=modules/org-eclipse-core-runtime.jar is.autoload=true nbm.module.author=Tomas Stupka diff --git a/o.eclipse.core.runtime/nbproject/project.xml b/o.eclipse.core.runtime/nbproject/project.xml index 56ba189a0..908d3427c 100644 --- a/o.eclipse.core.runtime/nbproject/project.xml +++ b/o.eclipse.core.runtime/nbproject/project.xml @@ -76,7 +76,7 @@ </public-packages> <class-path-extension> <runtime-relative-path>org-eclipse-core-runtime.jar</runtime-relative-path> - <binary-origin>external/org.eclipse.core.runtime-3.7.0_nosignature.jar</binary-origin> + <binary-origin>external/org.eclipse.core.runtime-3.7.0.jar</binary-origin> </class-path-extension> </data> </configuration> ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          707. geertjanw commented on issue #226: [NETBEANS-54] adding license headers to UML files in openide.options URL: https://github.com/apache/incubator-netbeans/pull/226#issuecomment-341843803 Thanks for the review! Merging. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          708. geertjanw closed pull request #226: [NETBEANS-54] adding license headers to UML files in openide.options URL: https://github.com/apache/incubator-netbeans/pull/226 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/openide.options/uml/options.argo b/openide.options/uml/options.argo index 84dc573a5..bfa9ac79d 100644 --- a/openide.options/uml/options.argo +++ b/openide.options/uml/options.argo @@ -1,4 +1,24 @@ <?xml version = "1.0" encoding = "ISO-8859-1" ?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!DOCTYPE argo SYSTEM "argo.dtd" > <argo> <documentation> diff --git a/openide.options/uml/options.xmi b/openide.options/uml/options.xmi index d716a478c..17cfd1877 100644 --- a/openide.options/uml/options.xmi +++ b/openide.options/uml/options.xmi @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!DOCTYPE XMI SYSTEM "uml13.dtd"> <XMI xmi.version="1.0"> <XMI.header> diff --git a/openide.options/uml/options_classdiagram8.pgml b/openide.options/uml/options_classdiagram8.pgml index 5db37f03c..19dbde928 100644 --- a/openide.options/uml/options_classdiagram8.pgml +++ b/openide.options/uml/options_classdiagram8.pgml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="ISO-8859-1" ?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!DOCTYPE pgml SYSTEM "pgml.dtd"> <pgml description="uci.uml.visual.UMLClassDiagram|-44-24--118--42-572200:e11d48b612:-7ff0" name="options class" diff --git a/openide.options/uml/options_usecasediagram3.pgml b/openide.options/uml/options_usecasediagram3.pgml index 1a056dbb2..b5ea53bc7 100644 --- a/openide.options/uml/options_usecasediagram3.pgml +++ b/openide.options/uml/options_usecasediagram3.pgml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="ISO-8859-1" ?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!DOCTYPE pgml SYSTEM "pgml.dtd"> <pgml description="uci.uml.visual.UMLUseCaseDiagram|-44-24--118--42-572200:e11d48b612:-7ff0" name="use case diagram 3" ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          709. geertjanw commented on issue #221: [NETBEANS-54] adding license headers to uml files in openide.windows URL: https://github.com/apache/incubator-netbeans/pull/221#issuecomment-341843893 Thanks for the review! Merging now. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          710. geertjanw closed pull request #221: [NETBEANS-54] adding license headers to uml files in openide.windows URL: https://github.com/apache/incubator-netbeans/pull/221 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/openide.windows/uml/windowsAPI.argo b/openide.windows/uml/windowsAPI.argo index 4be8eee56..ea56b567a 100644 --- a/openide.windows/uml/windowsAPI.argo +++ b/openide.windows/uml/windowsAPI.argo @@ -1,4 +1,24 @@ <?xml version = "1.0" encoding = "ISO-8859-1" ?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!DOCTYPE argo SYSTEM "argo.dtd" > <argo> <documentation> diff --git a/openide.windows/uml/windowsAPI.xmi b/openide.windows/uml/windowsAPI.xmi index 8daac2f36..b137dc6f7 100644 --- a/openide.windows/uml/windowsAPI.xmi +++ b/openide.windows/uml/windowsAPI.xmi @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!DOCTYPE XMI SYSTEM "uml13.dtd"> <XMI xmi.version="1.0"> <XMI.header> diff --git a/openide.windows/uml/windowsAPI_classdiagram1.pgml b/openide.windows/uml/windowsAPI_classdiagram1.pgml index 460d399d0..11a82c601 100644 --- a/openide.windows/uml/windowsAPI_classdiagram1.pgml +++ b/openide.windows/uml/windowsAPI_classdiagram1.pgml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="ISO-8859-1" ?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!DOCTYPE pgml SYSTEM "pgml.dtd"> <pgml description="uci.uml.visual.UMLClassDiagram|-44-24--118--42-4c0a7f:e140cb5010:-8000" name="windows" diff --git a/openide.windows/uml/windowsAPI_classdiagram2.pgml b/openide.windows/uml/windowsAPI_classdiagram2.pgml index b08ce785f..7e39f86e4 100644 --- a/openide.windows/uml/windowsAPI_classdiagram2.pgml +++ b/openide.windows/uml/windowsAPI_classdiagram2.pgml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="ISO-8859-1" ?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!DOCTYPE pgml SYSTEM "pgml.dtd"> <pgml description="uci.uml.visual.UMLClassDiagram|-44-24--118--42-4c0a7f:e140cb5010:-8000" name="inputoutput" diff --git a/openide.windows/uml/windowsAPI_usecasediagram1.pgml b/openide.windows/uml/windowsAPI_usecasediagram1.pgml index 6ed9ba3c8..880c4590c 100644 --- a/openide.windows/uml/windowsAPI_usecasediagram1.pgml +++ b/openide.windows/uml/windowsAPI_usecasediagram1.pgml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="ISO-8859-1" ?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!DOCTYPE pgml SYSTEM "pgml.dtd"> <pgml description="uci.uml.visual.UMLUseCaseDiagram|-44-24--118--42-4c0a7f:e140cb5010:-8000" name="use case diagram 1" ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          711. geertjanw commented on issue #232: [NETBEANS-54] Module Review jellytools.platform URL: https://github.com/apache/incubator-netbeans/pull/232#issuecomment-341853421 Thanks for the review — and will follow your insights here ASAP. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          712. geertjanw commented on issue #227: [NETBEANS-54] adding license headers to various files in nbbuild URL: https://github.com/apache/incubator-netbeans/pull/227#issuecomment-341853553 Thanks a lot for the review! ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          713. borxa opened a new pull request #235: [NETBEANS-54] Module Review html.editor URL: https://github.com/apache/incubator-netbeans/pull/235 Files to be solved centrally: html.editor/src/org/netbeans/modules/html/editor/options/ui/formatSample.html html.editor/src/org/netbeans/modules/html/editor/resources/HTMLExample html.editor/src/org/netbeans/modules/html/editor/resources/XHTMLExample html.editor/src/org/netbeans/modules/html/editor/todo.txt Added license to html catalog files (i don't know if these files need to be licensed): html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/3_2/catalog html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/4_0/catalog html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/4_01/catalog html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/xhtml/catalog (they are parsed in html.editor/src/org/netbeans/modules/html/editor/NbReaderProvider.java:98) This module use external "library" html-4.01.zip for html help. It doesn't exist in maven public repositories. It is downloaded from https://www.w3.org/TR/html401/ Module should be updated to HTML5 https://www.w3.org/TR/html5/ ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          714. vieiro opened a new pull request #236: [NETBEANS-54] Module Review editor (rat exclusions) URL: https://github.com/apache/incubator-netbeans/pull/236 - Added test files to rat exclusion list. - Added a license to a README file. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          715. vieiro commented on issue #42: [NETBEANS-54] Module Review editor URL: https://github.com/apache/incubator-netbeans/pull/42#issuecomment-341875816 See #236 https://github.com/apache/incubator-netbeans/pull/236 @geertjanw I missed your first comments completely (lost in email folders), please open an issue for these updates, I won't miss those! Closing this PR now. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          716. vieiro closed pull request #42: [NETBEANS-54] Module Review editor URL: https://github.com/apache/incubator-netbeans/pull/42 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/editor/demosrc/README b/editor/demosrc/README index 23c7ca80b..70a9628b7 100644 --- a/editor/demosrc/README +++ b/editor/demosrc/README @@ -1,3 +1,5 @@ +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0. + Introduction: This is the implementation of simple standalone editor application. It is based on the fact that NetBeans editors are pure swing editors. diff --git a/nbbuild/build.xml b/nbbuild/build.xml index 12bd9ada1..237a9ffa1 100644 --- a/nbbuild/build.xml +++ b/nbbuild/build.xml @@ -2002,6 +2002,14 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <exclude name="debugger.jpda/test/unit/src/org/netbeans/api/debugger/jpda/testapps/JspLineBreakpointApp.txt" /> <!-- test data --> <exclude name="diff/test/unit/src/org/netbeans/modules/diff/builtin/provider/*.txt" /> <!--test data--> <exclude name="diff/test/unit/src/org/netbeans/modules/diff/builtin/visualizer/data/**" /> <!--test data--> + <exclude name="editor/test/qa-functional/data/projects/editor_test/src/**.txt" /> <!-- test data --> + <exclude name="editor/test/qa-functional/data/**.pass" /> <!-- qa test data --> + <exclude name="editor/test/qa-functional/src/org/netbeans/test/editor/suites/keybindings/actions.txt" /> <!-- qa test data --> + <exclude name="editor/test/qa-functional/data/projects/editor_test/src/org/netbeans/test/editor/search/IncrementalSearchTest/**.txt" /> <!-- qa test data --> + <exclude name="editor/test/unit/src/org/netbeans/modules/editor/resources/**.xml" /> <!-- unit test data --> + <exclude name="editor/demosrc/base/org/netbeans/editor/example/res/template.java_" /> <!-- template file --> + <exclude name="editor/demosrc/base/org/netbeans/editor/example/res/template.html_" /> <!-- template file --> + <exclude name="editor/demosrc/properties-addon/org/netbeans/editor/example/res/template.properties" /> <!-- template file --> <exclude name="editor.fold/test/unit/src/org/netbeans/modules/editor/fold/FoldContentReader.txt" /> <!--test data--> <exclude name="editor.plain/src/org/netbeans/modules/editor/plain/resources/PlainTextExample" /> <!--license would be visible to users in the Fonts/Colors settings--> <exclude name="editor.settings.storage/test/unit/src/org/netbeans/modules/editor/settings/storage/compatibility/p1/**" /> <!--test data--> ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          717. vieiro opened a new pull request #237: [NETBEANS-54] Module Review o.eclipse.equinox.app URL: https://github.com/apache/incubator-netbeans/pull/237 - Added maven coordinates for the external binary. - No other licensing issues found. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          718. vieiro opened a new pull request #238: [NETBEANS-54] Module Review o.eclipse.equinox.common URL: https://github.com/apache/incubator-netbeans/pull/238 - Added maven coordinates for the external binary. - No other licensing issues found. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          719. geertjanw commented on issue #224: [NETBEANS-54] adding licenses to uml files in openide.nodes URL: https://github.com/apache/incubator-netbeans/pull/224#issuecomment-341882768 Merging. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          720. geertjanw closed pull request #224: [NETBEANS-54] adding licenses to uml files in openide.nodes URL: https://github.com/apache/incubator-netbeans/pull/224 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/openide.nodes/uml/classdiagram6.pgml b/openide.nodes/uml/classdiagram6.pgml index 83db18f43..e585a7e31 100644 --- a/openide.nodes/uml/classdiagram6.pgml +++ b/openide.nodes/uml/classdiagram6.pgml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="ISO-8859-1" ?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!DOCTYPE pgml SYSTEM "pgml.dtd"> <pgml description="uci.uml.visual.UMLClassDiagram|-44-24--118--42-79338f:e107ce5672:-7fea" name="properties" diff --git a/openide.nodes/uml/classdiagram7.pgml b/openide.nodes/uml/classdiagram7.pgml index 9a0552dae..e9e11a26d 100644 --- a/openide.nodes/uml/classdiagram7.pgml +++ b/openide.nodes/uml/classdiagram7.pgml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="ISO-8859-1" ?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!DOCTYPE pgml SYSTEM "pgml.dtd"> <pgml description="uci.uml.visual.UMLClassDiagram|-44-24--118--42-79338f:e107ce5672:-7fea" name="datatransfer" diff --git a/openide.nodes/uml/classdiagram8.pgml b/openide.nodes/uml/classdiagram8.pgml index 6d85c9c4c..bd6e497a4 100644 --- a/openide.nodes/uml/classdiagram8.pgml +++ b/openide.nodes/uml/classdiagram8.pgml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="ISO-8859-1" ?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!DOCTYPE pgml SYSTEM "pgml.dtd"> <pgml description="uci.uml.visual.UMLClassDiagram|-44-24--118--42-79338f:e107ce5672:-7fea" name="events" diff --git a/openide.nodes/uml/node_API.argo b/openide.nodes/uml/node_API.argo index 2221387f8..7558da73f 100644 --- a/openide.nodes/uml/node_API.argo +++ b/openide.nodes/uml/node_API.argo @@ -1,4 +1,24 @@ <?xml version = "1.0" encoding = "ISO-8859-1" ?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!DOCTYPE argo SYSTEM "argo.dtd" > <argo> <documentation> diff --git a/openide.nodes/uml/node_API.xmi b/openide.nodes/uml/node_API.xmi index e8bf33bf4..eced6ad75 100644 --- a/openide.nodes/uml/node_API.xmi +++ b/openide.nodes/uml/node_API.xmi @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!DOCTYPE XMI SYSTEM "uml13.dtd"> <XMI xmi.version="1.0"> <XMI.header> diff --git a/openide.nodes/uml/node_API_API_classdiagram3.pgml b/openide.nodes/uml/node_API_API_classdiagram3.pgml index 074f354ed..a4946da9a 100644 --- a/openide.nodes/uml/node_API_API_classdiagram3.pgml +++ b/openide.nodes/uml/node_API_API_classdiagram3.pgml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="ISO-8859-1" ?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!DOCTYPE pgml SYSTEM "pgml.dtd"> <pgml description="uci.uml.visual.UMLClassDiagram|-44-24--118--42-79338f:e107ce5672:-7fea" name="children" diff --git a/openide.nodes/uml/node_API_API_classdiagram4.pgml b/openide.nodes/uml/node_API_API_classdiagram4.pgml index 423dd78b9..54bff3b93 100644 --- a/openide.nodes/uml/node_API_API_classdiagram4.pgml +++ b/openide.nodes/uml/node_API_API_classdiagram4.pgml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="ISO-8859-1" ?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!DOCTYPE pgml SYSTEM "pgml.dtd"> <pgml description="uci.uml.visual.UMLClassDiagram|-44-24--118--42-79338f:e107ce5672:-7fea" name="nodes" diff --git a/openide.nodes/uml/node_API_API_classdiagram5.pgml b/openide.nodes/uml/node_API_API_classdiagram5.pgml index 7749bf29c..4c94881b4 100644 --- a/openide.nodes/uml/node_API_API_classdiagram5.pgml +++ b/openide.nodes/uml/node_API_API_classdiagram5.pgml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="ISO-8859-1" ?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!DOCTYPE pgml SYSTEM "pgml.dtd"> <pgml description="uci.uml.visual.UMLClassDiagram|-44-24--118--42-79338f:e107ce5672:-7fea" name="ordering" diff --git a/openide.nodes/uml/node_API_API_usecasediagram3.pgml b/openide.nodes/uml/node_API_API_usecasediagram3.pgml index bda426694..b82554c39 100644 --- a/openide.nodes/uml/node_API_API_usecasediagram3.pgml +++ b/openide.nodes/uml/node_API_API_usecasediagram3.pgml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="ISO-8859-1" ?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <!DOCTYPE pgml SYSTEM "pgml.dtd"> <pgml description="uci.uml.visual.UMLUseCaseDiagram|-44-24--118--42-79338f:e107ce5672:-7fea" name="use case diagram 3" ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          721. geertjanw commented on issue #232: [NETBEANS-54] Module Review jellytools.platform URL: https://github.com/apache/incubator-netbeans/pull/232#issuecomment-341888182 OK, removed the license as suggested by @junichi11. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          722. geertjanw commented on issue #227: [NETBEANS-54] adding license headers to various files in nbbuild URL: https://github.com/apache/incubator-netbeans/pull/227#issuecomment-341888340 Is there a way to integrate your changes via GitHub -- or must I manually rework the code in my fork and then push? ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          723. geertjanw commented on issue #236: [NETBEANS-54] Module Review editor (rat exclusions) URL: https://github.com/apache/incubator-netbeans/pull/236#issuecomment-341888446 Great, thanks, merging. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          724. geertjanw closed pull request #236: [NETBEANS-54] Module Review editor (rat exclusions) URL: https://github.com/apache/incubator-netbeans/pull/236 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/editor/demosrc/README b/editor/demosrc/README index 23c7ca80b..70a9628b7 100644 --- a/editor/demosrc/README +++ b/editor/demosrc/README @@ -1,3 +1,5 @@ +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0. + Introduction: This is the implementation of simple standalone editor application. It is based on the fact that NetBeans editors are pure swing editors. diff --git a/nbbuild/build.xml b/nbbuild/build.xml index 12bd9ada1..fbf2dbdb3 100644 --- a/nbbuild/build.xml +++ b/nbbuild/build.xml @@ -2002,6 +2002,11 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <exclude name="debugger.jpda/test/unit/src/org/netbeans/api/debugger/jpda/testapps/JspLineBreakpointApp.txt" /> <!-- test data --> <exclude name="diff/test/unit/src/org/netbeans/modules/diff/builtin/provider/*.txt" /> <!--test data--> <exclude name="diff/test/unit/src/org/netbeans/modules/diff/builtin/visualizer/data/**" /> <!--test data--> + <exclude name="editor/demosrc/base/org/netbeans/editor/example/res/template.html_" /> <!-- template file --> + <exclude name="editor/demosrc/base/org/netbeans/editor/example/res/template.java_" /> <!-- template file --> + <exclude name="editor/demosrc/properties-addon/org/netbeans/editor/example/res/template.properties" /> <!-- template file --> + <exclude name="editor/test/qa-functional/src/org/netbeans/test/editor/suites/keybindings/actions.txt" /> <!-- test data --> + <exclude name="editor/test/unit/src/org/netbeans/modules/editor/resources/testAnnotation*.xml" /> <!-- test data --> <exclude name="editor.fold/test/unit/src/org/netbeans/modules/editor/fold/FoldContentReader.txt" /> <!--test data--> <exclude name="editor.plain/src/org/netbeans/modules/editor/plain/resources/PlainTextExample" /> <!--license would be visible to users in the Fonts/Colors settings--> <exclude name="editor.settings.storage/test/unit/src/org/netbeans/modules/editor/settings/storage/compatibility/p1/**" /> <!--test data--> ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          725. matthiasblaesing commented on issue #227: [NETBEANS-54] adding license headers to various files in nbbuild URL: https://github.com/apache/incubator-netbeans/pull/227#issuecomment-341894037 @geertjanw for this small change this workflow is overkill, but its good to try :-) I pushed my change into a branch in my repository (branch PR227-update): https://github.com/matthiasblaesing/incubator-netbeans.git You can pull my changes with: ``` git pull https://github.com/matthiasblaesing/incubator-netbeans.git PR227-update ``` As I used your commits unmodified a fast-forward merge will be done. After the merge one other unittest will fail, that failure is not caused by this changeset and already fixed in master. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          726. geertjanw commented on issue #227: [NETBEANS-54] adding license headers to various files in nbbuild URL: https://github.com/apache/incubator-netbeans/pull/227#issuecomment-341894528 I think it worked. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          727. junichi11 commented on issue #232: [NETBEANS-54] Module Review jellytools.platform URL: https://github.com/apache/incubator-netbeans/pull/232#issuecomment-341894836 Thank you for fixing it! We can exclude `version_info` from rat as well as `*.mf`. https://github.com/apache/incubator-netbeans/blob/19ec0a5a4d7183ff3c201c804c63f1fbef938392/nbbuild/build.xml#L1979 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          728. geertjanw commented on issue #232: [NETBEANS-54] Module Review jellytools.platform URL: https://github.com/apache/incubator-netbeans/pull/232#issuecomment-341895116 Thanks a lot for the support, and merging. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          729. geertjanw closed pull request #232: [NETBEANS-54] Module Review jellytools.platform URL: https://github.com/apache/incubator-netbeans/pull/232 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/jellytools.platform/src/org/netbeans/jellytools/timeouts b/jellytools.platform/src/org/netbeans/jellytools/timeouts index 4737be238..86dd1913a 100644 --- a/jellytools.platform/src/org/netbeans/jellytools/timeouts +++ b/jellytools.platform/src/org/netbeans/jellytools/timeouts @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. ComponentOperator.WaitComponentTimeout=30000 ComponentOperator.WaitComponentEnabledTimeout=10000 ComponentOperator.WaitFocusTimeout=1000 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          730. matthiasblaesing commented on issue #227: [NETBEANS-54] adding license headers to various files in nbbuild URL: https://github.com/apache/incubator-netbeans/pull/227#issuecomment-341900059 Thanks - build looks good, unittests work correctly - feel free to merge. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          731. geertjanw commented on issue #227: [NETBEANS-54] adding license headers to various files in nbbuild URL: https://github.com/apache/incubator-netbeans/pull/227#issuecomment-341902049 Great, merging. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          732. geertjanw closed pull request #227: [NETBEANS-54] adding license headers to various files in nbbuild URL: https://github.com/apache/incubator-netbeans/pull/227 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-binaries b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-binaries index 174ac962c..6f6c60da6 100644 --- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-binaries +++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-binaries @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + # List of patterns (one per line) to skip over in VerifyLibsAndLicenses.testNoStrayThirdPartyBinaries. # Uses standard Ant pattern syntax, in ${nb_all} among modules included in cluster config. # Implicit includes is **/*.jar,**/*.zip. diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-binary-overlaps b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-binary-overlaps index 90501676d..e40d2b129 100644 --- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-binary-overlaps +++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-binary-overlaps @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + # List of patterns (one pair per line) to skip over in CreateLicenseSummary.testBinariesAreUnique. # Both sides of the pair must match for the pair to be skipped. # Uses standard Ant pattern syntax, with the basedir being the root of the NB build. diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps index db4eb0b56..400ec1b86 100644 --- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps +++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + # List of patterns (one pair per line) to skip over in VerifyLibsAndLicenses.testBinaryUniqueness. # Both sides of the pair must match for the pair to be skipped. # Uses standard Ant pattern syntax, in ${nb_all} among modules included in cluster config. diff --git a/nbbuild/hudson/core-main b/nbbuild/hudson/core-main index 81bf326b9..4175c77f6 100644 --- a/nbbuild/hudson/core-main +++ b/nbbuild/hudson/core-main @@ -1,4 +1,22 @@ #!/bin/sh + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + set -x ANT_OPTS="$ANT_OPTS -Xmx1G" diff --git a/nbbuild/hudson/javascript-tests b/nbbuild/hudson/javascript-tests index aa2387681..58844b25a 100644 --- a/nbbuild/hudson/javascript-tests +++ b/nbbuild/hudson/javascript-tests @@ -1,3 +1,21 @@ #!/bin/sh + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + ant || exit 2 ant -f javascript.editing/build-javascript.xml runtests || exit 3 diff --git a/nbbuild/hudson/nbms-and-javadoc b/nbbuild/hudson/nbms-and-javadoc index 2aa4a712f..eabe0bc1c 100755 --- a/nbbuild/hudson/nbms-and-javadoc +++ b/nbbuild/hudson/nbms-and-javadoc @@ -1,4 +1,22 @@ #!/bin/sh + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + set -x keystore=$SECRET/NBstore diff --git a/nbbuild/hudson/round-robin-build b/nbbuild/hudson/round-robin-build index 1ac1095b1..07cfa2ed8 100644 --- a/nbbuild/hudson/round-robin-build +++ b/nbbuild/hudson/round-robin-build @@ -1,5 +1,22 @@ #!/bin/sh +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + dobuild() { RESULT=`pwd`/nbbuild/build/test-results.txt export RESULT diff --git a/nbbuild/hudson/round-robin-push b/nbbuild/hudson/round-robin-push index aa34c469d..e0fe781bf 100644 --- a/nbbuild/hudson/round-robin-push +++ b/nbbuild/hudson/round-robin-push @@ -1,5 +1,22 @@ #!/bin/sh +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + [ -n "$pop_url" ] || exit 101 if [ -z "$pop_build_info" ]; then pop_build_info="nbbuild/build/build_info" diff --git a/nbbuild/hudson/round-sync b/nbbuild/hudson/round-sync index 19af80c12..9b5fbabde 100644 --- a/nbbuild/hudson/round-sync +++ b/nbbuild/hudson/round-sync @@ -1,5 +1,22 @@ #!/bin/sh +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + [ -n "$push_username" ] || exit 102 [ -n "$push_password" ] || exit 103 [ -n "$push_repo" ] || exit 104 diff --git a/nbbuild/hudson/sigtests b/nbbuild/hudson/sigtests index 4d8ebd37c..867a549ae 100644 --- a/nbbuild/hudson/sigtests +++ b/nbbuild/hudson/sigtests @@ -1,5 +1,22 @@ #!/bin/sh +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + if [ -z "$JOB_URL" ]; then JOB_URL=http://deadlock.netbeans.org/job/nbms-and-javadoc/ fi diff --git a/nbbuild/hudson/team-private-repo b/nbbuild/hudson/team-private-repo index 370f2da95..9059a1899 100644 --- a/nbbuild/hudson/team-private-repo +++ b/nbbuild/hudson/team-private-repo @@ -1,4 +1,22 @@ #!/bin/bash + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + set -x if [ "$1" != "" ] ; then repository=$1 diff --git a/nbbuild/hudson/team-repo b/nbbuild/hudson/team-repo index 974854c69..6103f4124 100644 --- a/nbbuild/hudson/team-repo +++ b/nbbuild/hudson/team-repo @@ -1,5 +1,22 @@ #!/bin/sh +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + if [ -z $repository && -n $1 ]; then repository = $1 fi diff --git a/nbbuild/hudson/test-platform b/nbbuild/hudson/test-platform index 409e5208d..e536b06e6 100644 --- a/nbbuild/hudson/test-platform +++ b/nbbuild/hudson/test-platform @@ -1,5 +1,22 @@ #!/bin/sh +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + # XXX consider using lastStableBuild BUILD=`wget http://deadlock.nbextras.org/hudson/job/trunk/lastSuccessfulBuild/buildNumber -O -` diff --git a/nbbuild/hudson/trunk b/nbbuild/hudson/trunk index e6f4f8970..708c2e9ae 100644 --- a/nbbuild/hudson/trunk +++ b/nbbuild/hudson/trunk @@ -1,2 +1,20 @@ #!/bin/sh + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + ant -Dcontinue.after.failing.tests=true -Dtest.fail.on.error=false build-nozip commit-validation build-test-dist diff --git a/nbbuild/javadoctools/export2branding.xsl b/nbbuild/javadoctools/export2branding.xsl index 3eb61a0f0..40a9d3073 100644 --- a/nbbuild/javadoctools/export2branding.xsl +++ b/nbbuild/javadoctools/export2branding.xsl @@ -1,47 +1,23 @@ <?xml version="1.0" encoding="UTF-8" ?> <!-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" - -Contributor(s): - -The Original Software is NetBeans. The Initial Developer of the 77Original -Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun -Microsystems, Inc. All Rights Reserved. - -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. --> <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> <xsl:output method="html"/> diff --git a/nbbuild/javadoctools/export2layer.xsl b/nbbuild/javadoctools/export2layer.xsl index c7be1249c..4c582d12b 100644 --- a/nbbuild/javadoctools/export2layer.xsl +++ b/nbbuild/javadoctools/export2layer.xsl @@ -1,47 +1,23 @@ <?xml version="1.0" encoding="UTF-8" ?> <!-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" - -Contributor(s): - -The Original Software is NetBeans. The Initial Developer of the 77Original -Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun -Microsystems, Inc. All Rights Reserved. - -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. --> <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> <xsl:output method="html"/> diff --git a/nbbuild/javadoctools/export2property.xsl b/nbbuild/javadoctools/export2property.xsl index 73c0f025e..ad0b1982a 100644 --- a/nbbuild/javadoctools/export2property.xsl +++ b/nbbuild/javadoctools/export2property.xsl @@ -1,47 +1,23 @@ <?xml version="1.0" encoding="UTF-8" ?> <!-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" - -Contributor(s): - -The Original Software is NetBeans. The Initial Developer of the 77Original -Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun -Microsystems, Inc. All Rights Reserved. - -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. --> <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> <xsl:output method="html"/> diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/CheckLicenseAnt.xml b/nbbuild/test/unit/src/org/netbeans/nbbuild/CheckLicenseAnt.xml index b221e805e..5a6050ac1 100644 --- a/nbbuild/test/unit/src/org/netbeans/nbbuild/CheckLicenseAnt.xml +++ b/nbbuild/test/unit/src/org/netbeans/nbbuild/CheckLicenseAnt.xml @@ -1,5 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> <project name="Test" basedir="." default="all" > <taskdef name="checkl" classname="org.netbeans.nbbuild.CheckLicense" diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/FixDependencies-cnd-dwarfdiscovery.xml b/nbbuild/test/unit/src/org/netbeans/nbbuild/FixDependencies-cnd-dwarfdiscovery.xml index e20d525da..19a26715f 100644 --- a/nbbuild/test/unit/src/org/netbeans/nbbuild/FixDependencies-cnd-dwarfdiscovery.xml +++ b/nbbuild/test/unit/src/org/netbeans/nbbuild/FixDependencies-cnd-dwarfdiscovery.xml @@ -1,4 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.apisupport.project</type> <configuration> diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/FixDependencies-core.kit.xml b/nbbuild/test/unit/src/org/netbeans/nbbuild/FixDependencies-core.kit.xml index b0365231e..5f6fb1ae5 100644 --- a/nbbuild/test/unit/src/org/netbeans/nbbuild/FixDependencies-core.kit.xml +++ b/nbbuild/test/unit/src/org/netbeans/nbbuild/FixDependencies-core.kit.xml @@ -1,4 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> <project xmlns="http://www.netbeans.org/ns/project/1"> <type>org.netbeans.modules.apisupport.project</type> <configuration> diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/FixDependenciesTest.java b/nbbuild/test/unit/src/org/netbeans/nbbuild/FixDependenciesTest.java index acb901586..a8d2beabb 100644 --- a/nbbuild/test/unit/src/org/netbeans/nbbuild/FixDependenciesTest.java +++ b/nbbuild/test/unit/src/org/netbeans/nbbuild/FixDependenciesTest.java @@ -55,6 +55,7 @@ public void testWrongIndentation() throws Exception { ); + String input = readFile (xml); execute (f, new String[] { }); String result = readFile (xml); @@ -77,8 +78,20 @@ public void testWrongIndentation() throws Exception { cnt++; } + // Skip common prefix for input + result, assumption: inputfile is + // correctly formatted. A license header can contain empty lines this + // way. + int common = 0; + for(int i = 0; i < input.length() && i < result.length(); i++) { + if(input.charAt(i) == result.charAt(i)) { + common = i; + } else { + break; + } + } + assertEquals("There are three dependencies\n" + result, 3, cnt); - for (String line : result.split("\n")) { + for (String line : result.substring(common).split("\n")) { if (line.trim().length() == 0) { fail("No empty lines:\n" + result); } diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/autoupdate.xml b/nbbuild/test/unit/src/org/netbeans/nbbuild/autoupdate.xml index fd77bb8d1..892c66142 100644 --- a/nbbuild/test/unit/src/org/netbeans/nbbuild/autoupdate.xml +++ b/nbbuild/test/unit/src/org/netbeans/nbbuild/autoupdate.xml @@ -1,4 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> <project name="changeme" default="all" basedir="."> <property name="force" value="false"/> <target name="all"> diff --git a/nbbuild/test/unit/src/org/netbeans/nbbuild/org-netbeans-api-annotations-common.xml b/nbbuild/test/unit/src/org/netbeans/nbbuild/org-netbeans-api-annotations-common.xml index 1d6a7bcba..776dcd762 100644 --- a/nbbuild/test/unit/src/org/netbeans/nbbuild/org-netbeans-api-annotations-common.xml +++ b/nbbuild/test/unit/src/org/netbeans/nbbuild/org-netbeans-api-annotations-common.xml @@ -1,5 +1,22 @@ <?xml version="1.0" encoding="UTF-8" ?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> <!DOCTYPE module_updates PUBLIC "-//NetBeans//DTD Autoupdate Catalog 2.6//EN" "http://www.netbeans.org/dtds/autoupdate-catalog-2_6.dtd"> <module_updates timestamp="46/00/08/13/11/2009"> ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          733. geertjanw commented on issue #225: [NETBEANS-54] exclude .ser files via Rat exclusions URL: https://github.com/apache/incubator-netbeans/pull/225#issuecomment-341903209 Can someone advise how to resolve the conflict here? ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          734. matthiasblaesing commented on issue #235: [NETBEANS-54] Module Review html.editor URL: https://github.com/apache/incubator-netbeans/pull/235#issuecomment-341903714 My reading of NbReaderProvider is, that there can't be comments in the catalog files. At this point the catalog files are useless, as the corresponding DTDs are not present anymore. I raised [NETBEANS-114](https://issues.apache.org/jira/browse/NETBEANS-114) for this. To get this on I would do this: - remove the license from the catalog files - add excludes to build.xml for rat: ```xml <exclude name="html.editor/src/org/netbeans/modules/html/editor/options/ui/formatSample.html" /> <!--user visible file template--> <exclude name="html.editor/src/org/netbeans/modules/html/editor/resources/HTMLExample" /> <!--user visible file template--> <exclude name="html.editor/src/org/netbeans/modules/html/editor/resources/XHTMLExample" /> <!--user visible file template--> <exclude name="html.editor/src/org/netbeans/modules/html/editor/todo.txt" /> <!--no degree of creativity--> <exclude name="html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/*/catalog" /> <!--no degree of creativity--> ``` ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          735. matthiasblaesing closed pull request #238: [NETBEANS-54] Module Review o.eclipse.equinox.common URL: https://github.com/apache/incubator-netbeans/pull/238 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/o.eclipse.equinox.common/external/binaries-list b/o.eclipse.equinox.common/external/binaries-list index 72d560dd6..18a56387f 100644 --- a/o.eclipse.equinox.common/external/binaries-list +++ b/o.eclipse.equinox.common/external/binaries-list @@ -14,4 +14,4 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -4EE275AE73A140A403903D7E4DBA68C8FBB07001 org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar +AB81FD273D933406A855D23A3C341B668B2F9CEF org.jibx.config.3rdparty.org.eclipse:org.eclipse.equinox.common:3.6.0.v20110523 diff --git a/o.eclipse.equinox.common/nbproject/project.properties b/o.eclipse.equinox.common/nbproject/project.properties index 262c8b39d..91a2ee6ba 100644 --- a/o.eclipse.equinox.common/nbproject/project.properties +++ b/o.eclipse.equinox.common/nbproject/project.properties @@ -14,6 +14,6 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -release.external/org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar=modules/org-eclipse-equinox-common.jar +release.external/org.eclipse.equinox.common-3.6.0.v20110523.jar=modules/org-eclipse-equinox-common.jar is.autoload=true -nbm.module.author=Tomas Stupka \ No newline at end of file +nbm.module.author=Tomas Stupka diff --git a/o.eclipse.equinox.common/nbproject/project.xml b/o.eclipse.equinox.common/nbproject/project.xml index bea66c285..09098eeba 100644 --- a/o.eclipse.equinox.common/nbproject/project.xml +++ b/o.eclipse.equinox.common/nbproject/project.xml @@ -28,8 +28,8 @@ <public-packages/> <class-path-extension> <runtime-relative-path>org-eclipse-equinox-common.jar</runtime-relative-path> - <binary-origin>external/org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar</binary-origin> + <binary-origin>external/org.eclipse.equinox.common-3.6.0.v20110523.jar</binary-origin> </class-path-extension> </data> </configuration> -</project> \ No newline at end of file +</project> ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          736. matthiasblaesing closed pull request #237: [NETBEANS-54] Module Review o.eclipse.equinox.app URL: https://github.com/apache/incubator-netbeans/pull/237 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/o.eclipse.equinox.app/external/binaries-list b/o.eclipse.equinox.app/external/binaries-list index bdd9386b7..7cf1d975d 100644 --- a/o.eclipse.equinox.app/external/binaries-list +++ b/o.eclipse.equinox.app/external/binaries-list @@ -14,4 +14,4 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -BD55836AABD558DC643A7844B78866AD990544BC org.eclipse.equinox.app-1.3.100_nosignature.jar +E7169B33D352F5DDB6EACE73F5A4D29AAE3B91EC org.eclipse.equinox:org.eclipse.equinox.app:1.3.100 diff --git a/o.eclipse.equinox.app/nbproject/project.properties b/o.eclipse.equinox.app/nbproject/project.properties index aac99d85b..9618ba067 100644 --- a/o.eclipse.equinox.app/nbproject/project.properties +++ b/o.eclipse.equinox.app/nbproject/project.properties @@ -14,6 +14,6 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -release.external/org.eclipse.equinox.app-1.3.100_nosignature.jar=modules/org-eclipse-equinox-app.jar +release.external/org.eclipse.equinox.app-1.3.100.jar=modules/org-eclipse-equinox-app.jar is.autoload=true nbm.module.author=Tomas Stupka diff --git a/o.eclipse.equinox.app/nbproject/project.xml b/o.eclipse.equinox.app/nbproject/project.xml index 99bc147bc..412dc589a 100644 --- a/o.eclipse.equinox.app/nbproject/project.xml +++ b/o.eclipse.equinox.app/nbproject/project.xml @@ -39,7 +39,7 @@ <public-packages/> <class-path-extension> <runtime-relative-path>org-eclipse-equinox-app.jar</runtime-relative-path> - <binary-origin>external/org.eclipse.equinox.app-1.3.100_nosignature.jar</binary-origin> + <binary-origin>external/org.eclipse.equinox.app-1.3.100.jar</binary-origin> </class-path-extension> </data> </configuration> ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          737. matthiasblaesing commented on issue #225: [NETBEANS-54] exclude .ser files via Rat exclusions URL: https://github.com/apache/incubator-netbeans/pull/225#issuecomment-341905492 To resolve the conflict I suggest that you: - rebase the changes onto master - resolve the conflict while rebasing - push the updated branch (you'll need to do a forced-push to be able to push a rebased branch) ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          738. geertjanw commented on issue #220: [NETBEANS-54] Module Review performance URL: https://github.com/apache/incubator-netbeans/pull/220#issuecomment-341910995 Great, merging. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          739. geertjanw closed pull request #220: [NETBEANS-54] Module Review performance URL: https://github.com/apache/incubator-netbeans/pull/220 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/performance/actionsframework/src/org/netbeans/actions/examples/actions.properties b/performance/actionsframework/src/org/netbeans/actions/examples/actions.properties index fbd453937..61a306158 100644 --- a/performance/actionsframework/src/org/netbeans/actions/examples/actions.properties +++ b/performance/actionsframework/src/org/netbeans/actions/examples/actions.properties @@ -1,41 +1,19 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Copyright (c) 2004, 2016 Oracle and/or its affiliates. All rights reserved. +# http://www.apache.org/licenses/LICENSE-2.0 # -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. -# -# Contributor(s): -# Sample ResourceBundle properties file +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. file=File edit=Edit diff --git a/performance/benchmarks/test/reports/src/org/netbeans/performance/results/ComparePanel.form b/performance/benchmarks/test/reports/src/org/netbeans/performance/results/ComparePanel.form index ae681c40f..acccaa1fe 100644 --- a/performance/benchmarks/test/reports/src/org/netbeans/performance/results/ComparePanel.form +++ b/performance/benchmarks/test/reports/src/org/netbeans/performance/results/ComparePanel.form @@ -1,5 +1,26 @@ <?xml version="1.0" encoding="UTF-8" ?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> + <Form version="1.3" maxVersion="1.3" type="org.netbeans.modules.form.forminfo.JPanelFormInfo"> <AuxValues> <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/> diff --git a/performance/benchmarks/test/reports/style-html.xsl b/performance/benchmarks/test/reports/style-html.xsl index 5a1dae144..9f077251a 100644 --- a/performance/benchmarks/test/reports/style-html.xsl +++ b/performance/benchmarks/test/reports/style-html.xsl @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="windows-1250"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> diff --git a/performance/enterprise/test/qa-functional/data/BPELTestProject/src/SynchronousSample.bpel b/performance/enterprise/test/qa-functional/data/BPELTestProject/src/SynchronousSample.bpel index 1c47a2ec6..83ab399f3 100644 --- a/performance/enterprise/test/qa-functional/data/BPELTestProject/src/SynchronousSample.bpel +++ b/performance/enterprise/test/qa-functional/data/BPELTestProject/src/SynchronousSample.bpel @@ -1,5 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <process name="SynchronousSample" targetNamespace="http://enterprise.netbeans.org/bpel/SynchronousSample/SynchronousSample_1" diff --git a/performance/enterprise/test/qa-functional/data/BPELTestProject/src/SynchronousSample.wsdl b/performance/enterprise/test/qa-functional/data/BPELTestProject/src/SynchronousSample.wsdl index dfbeb1d60..e7a9d7229 100644 --- a/performance/enterprise/test/qa-functional/data/BPELTestProject/src/SynchronousSample.wsdl +++ b/performance/enterprise/test/qa-functional/data/BPELTestProject/src/SynchronousSample.wsdl @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" diff --git a/performance/enterprise/test/qa-functional/data/BPELTestProject/src/SynchronousSample.xsd b/performance/enterprise/test/qa-functional/data/BPELTestProject/src/SynchronousSample.xsd index 1d05efacc..14e7a843c 100644 --- a/performance/enterprise/test/qa-functional/data/BPELTestProject/src/SynchronousSample.xsd +++ b/performance/enterprise/test/qa-functional/data/BPELTestProject/src/SynchronousSample.xsd @@ -1,25 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> - <!-- - The contents of this file are subject to the terms of the Common Development - and Distribution License (the License). You may not use this file except in - compliance with the License. - - You can obtain a copy of the License at http://www.netbeans.org/cddl.html - or http://www.netbeans.org/cddl.txt. - - When distributing Covered Code, include this CDDL Header Notice in each file - and include the License file at http://www.netbeans.org/cddl.txt. - If applicable, add the following below the CDDL Header, with the fields - enclosed by brackets [] replaced by your own identifying information: - "Portions Copyrighted [year] [name of copyright owner]" - - The Original Software is NetBeans. The Initial Developer of the Original - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun - Microsystems, Inc. All Rights Reserved. ---> + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://xml.netbeans.org/schema/SynchronousSample" xmlns:tns="http://xml.netbeans.org/schema/SynchronousSample" diff --git a/performance/enterprise/test/qa-functional/data/TravelReservationService/ReservationPartnerServices/nbproject/ant-deploy.xml b/performance/enterprise/test/qa-functional/data/TravelReservationService/ReservationPartnerServices/nbproject/ant-deploy.xml index 5524a1cf0..5d61b47bd 100644 --- a/performance/enterprise/test/qa-functional/data/TravelReservationService/ReservationPartnerServices/nbproject/ant-deploy.xml +++ b/performance/enterprise/test/qa-functional/data/TravelReservationService/ReservationPartnerServices/nbproject/ant-deploy.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <project default="-deploy-ant" basedir="."> <target name="-init-cl-deployment-env" if="deploy.ant.enabled"> <property file="${deploy.ant.properties.file}"/> diff --git a/performance/enterprise/test/qa-functional/data/TravelReservationService/ReservationPartnerServices/src/java/partnerservices/callback/ItineraryPlusAirline.xml b/performance/enterprise/test/qa-functional/data/TravelReservationService/ReservationPartnerServices/src/java/partnerservices/callback/ItineraryPlusAirline.xml index 55b5d8298..487743bb1 100644 --- a/performance/enterprise/test/qa-functional/data/TravelReservationService/ReservationPartnerServices/src/java/partnerservices/callback/ItineraryPlusAirline.xml +++ b/performance/enterprise/test/qa-functional/data/TravelReservationService/ReservationPartnerServices/src/java/partnerservices/callback/ItineraryPlusAirline.xml @@ -1,3 +1,23 @@ +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"> <SOAP-ENV:Body> <TravelItinerary xmlns="http://www.opentravel.org/OTA/2003/05"> diff --git a/performance/enterprise/test/qa-functional/data/TravelReservationService/ReservationPartnerServices/src/java/partnerservices/callback/ItineraryPlusHotel.xml b/performance/enterprise/test/qa-functional/data/TravelReservationService/ReservationPartnerServices/src/java/partnerservices/callback/ItineraryPlusHotel.xml index 16525b5f3..c80e0c107 100644 --- a/performance/enterprise/test/qa-functional/data/TravelReservationService/ReservationPartnerServices/src/java/partnerservices/callback/ItineraryPlusHotel.xml +++ b/performance/enterprise/test/qa-functional/data/TravelReservationService/ReservationPartnerServices/src/java/partnerservices/callback/ItineraryPlusHotel.xml @@ -1,3 +1,23 @@ +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"> <SOAP-ENV:Body> <TravelItinerary xmlns="http://www.opentravel.org/OTA/2003/05"> diff --git a/performance/enterprise/test/qa-functional/data/TravelReservationService/ReservationPartnerServices/src/java/partnerservices/callback/ItineraryPlusVehicle.xml b/performance/enterprise/test/qa-functional/data/TravelReservationService/ReservationPartnerServices/src/java/partnerservices/callback/ItineraryPlusVehicle.xml index c18f63648..e1c11964a 100644 --- a/performance/enterprise/test/qa-functional/data/TravelReservationService/ReservationPartnerServices/src/java/partnerservices/callback/ItineraryPlusVehicle.xml +++ b/performance/enterprise/test/qa-functional/data/TravelReservationService/ReservationPartnerServices/src/java/partnerservices/callback/ItineraryPlusVehicle.xml @@ -1,3 +1,23 @@ +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"> <SOAP-ENV:Body> <TravelItinerary xmlns="http://www.opentravel.org/OTA/2003/05"> diff --git a/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/src/conf/AssemblyInformation.xml b/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/src/conf/AssemblyInformation.xml index d09e2a650..17bd1621e 100644 --- a/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/src/conf/AssemblyInformation.xml +++ b/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/src/conf/AssemblyInformation.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <jbi xmlns="http://java.sun.com/xml/ns/jbi" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0" xsi:schemaLocation="http://java.sun.com/xml/ns/jbi ./jbi.xsd"> <service-assembly> <identification> diff --git a/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/src/conf/BindingComponentInformation.xml b/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/src/conf/BindingComponentInformation.xml index 6fab6b32c..4eb2b9b5a 100644 --- a/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/src/conf/BindingComponentInformation.xml +++ b/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/src/conf/BindingComponentInformation.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <component-info-list> <component-info> <description>File Binding</description> diff --git a/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/src/conf/ComponentInformation.xml b/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/src/conf/ComponentInformation.xml index a4123507d..753f7bb88 100644 --- a/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/src/conf/ComponentInformation.xml +++ b/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/src/conf/ComponentInformation.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <component-info-list> <component-info> <description>File Binding</description> diff --git a/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/HasAirline/Concurrent.properties b/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/HasAirline/Concurrent.properties index 0501129c3..f3a98bee3 100644 --- a/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/HasAirline/Concurrent.properties +++ b/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/HasAirline/Concurrent.properties @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. calculatethroughput=false comparisontype=identical concurrentthreads=1 diff --git a/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/HasAirline/Input.xml b/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/HasAirline/Input.xml index 5d6c80182..851df3806 100644 --- a/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/HasAirline/Input.xml +++ b/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/HasAirline/Input.xml @@ -1,3 +1,23 @@ +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <SOAP-ENV:Envelope xsi:schemaLocation="http://schemas.xmlsoap.org/soap/envelope/ http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" diff --git a/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/HasAirline/Output.xml b/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/HasAirline/Output.xml index b92e3a2a5..efc07a710 100644 --- a/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/HasAirline/Output.xml +++ b/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/HasAirline/Output.xml @@ -1,3 +1,23 @@ +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <?xml version="1.0" encoding="UTF-8"?> <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schemas.xmlsoap.org/soap/envelope/ http://schemas.xmlsoap.org/soap/envelope/"> <SOAP-ENV:Header/> diff --git a/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/HasHotel/Concurrent.properties b/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/HasHotel/Concurrent.properties index a48f5ce35..baf80654a 100644 --- a/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/HasHotel/Concurrent.properties +++ b/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/HasHotel/Concurrent.properties @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. calculatethroughput=false comparisontype=identical concurrentthreads=1 diff --git a/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/HasHotel/Input.xml b/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/HasHotel/Input.xml index 783623893..927bd15de 100644 --- a/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/HasHotel/Input.xml +++ b/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/HasHotel/Input.xml @@ -1,3 +1,23 @@ +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <SOAP-ENV:Envelope xsi:schemaLocation="http://schemas.xmlsoap.org/soap/envelope/ http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" diff --git a/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/HasHotel/Output.xml b/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/HasHotel/Output.xml index 78f95f5c0..a112f8dfb 100644 --- a/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/HasHotel/Output.xml +++ b/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/HasHotel/Output.xml @@ -1,3 +1,23 @@ +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <?xml version="1.0" encoding="UTF-8"?> <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"> <SOAP-ENV:Body> diff --git a/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/HasNoReservations/Concurrent.properties b/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/HasNoReservations/Concurrent.properties index 949b9ad2b..663c33199 100644 --- a/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/HasNoReservations/Concurrent.properties +++ b/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/HasNoReservations/Concurrent.properties @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. calculatethroughput=false comparisontype=identical concurrentthreads=1 diff --git a/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/HasNoReservations/Input.xml b/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/HasNoReservations/Input.xml index c0f56871b..31a3e21b8 100644 --- a/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/HasNoReservations/Input.xml +++ b/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/HasNoReservations/Input.xml @@ -1,3 +1,23 @@ +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <SOAP-ENV:Envelope xsi:schemaLocation="http://schemas.xmlsoap.org/soap/envelope/ http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" diff --git a/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/HasNoReservations/Output.xml b/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/HasNoReservations/Output.xml index 1143b453a..6af24c2f9 100644 --- a/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/HasNoReservations/Output.xml +++ b/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/HasNoReservations/Output.xml @@ -1,3 +1,23 @@ +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <?xml version="1.0" encoding="UTF-8"?> <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schemas.xmlsoap.org/soap/envelope/ http://schemas.xmlsoap.org/soap/envelope/"> <SOAP-ENV:Header/> diff --git a/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/HasVehicle/Concurrent.properties b/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/HasVehicle/Concurrent.properties index 4594c02c5..d0b7fb56c 100644 --- a/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/HasVehicle/Concurrent.properties +++ b/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/HasVehicle/Concurrent.properties @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. calculatethroughput=false comparisontype=identical concurrentthreads=1 diff --git a/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/HasVehicle/Input.xml b/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/HasVehicle/Input.xml index 8feed265c..a19b4b805 100644 --- a/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/HasVehicle/Input.xml +++ b/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/HasVehicle/Input.xml @@ -1,3 +1,23 @@ +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <SOAP-ENV:Envelope xsi:schemaLocation="http://schemas.xmlsoap.org/soap/envelope/ http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" diff --git a/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/HasVehicle/Output.xml b/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/HasVehicle/Output.xml index 5f566af5d..7a4931484 100644 --- a/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/HasVehicle/Output.xml +++ b/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/HasVehicle/Output.xml @@ -1,3 +1,23 @@ +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <?xml version="1.0" encoding="UTF-8"?> <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schemas.xmlsoap.org/soap/envelope/ http://schemas.xmlsoap.org/soap/envelope/"> <SOAP-ENV:Header/> diff --git a/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/all-tests.properties b/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/all-tests.properties index a80c23aa0..de4c3cc1a 100644 --- a/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/all-tests.properties +++ b/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/all-tests.properties @@ -1 +1,17 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. testcases=HasNoReservations,HasAirline,HasVehicle,HasHotel diff --git a/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/selected-tests.properties b/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/selected-tests.properties index 9ec481fcb..56a6dd7d8 100644 --- a/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/selected-tests.properties +++ b/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/test/selected-tests.properties @@ -1 +1,17 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. testcases=HasHotel diff --git a/performance/jtrace/linux/Makefile b/performance/jtrace/linux/Makefile index c2e6d5425..dc3be15fa 100644 --- a/performance/jtrace/linux/Makefile +++ b/performance/jtrace/linux/Makefile @@ -1,47 +1,21 @@ # -*- Makefile -*- # -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -# -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. -# -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# Contributor(s): -# -# The Original Software is Forte for Java, Community Edition. The Initial -# Developer of the Original Software is Sun Microsystems, Inc. Portions -# Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. -# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. JDK_HOME = /usr/local/jdk diff --git a/performance/jtrace/win32/Makefile b/performance/jtrace/win32/Makefile index de9e48e9e..e00940653 100644 --- a/performance/jtrace/win32/Makefile +++ b/performance/jtrace/win32/Makefile @@ -1,47 +1,21 @@ # -*- Makefile -*- # -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -# -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. -# -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# Contributor(s): -# -# The Original Software is Forte for Java, Community Edition. The Initial -# Developer of the Original Software is Sun Microsystems, Inc. Portions -# Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. -# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. JDK_HOME = c:\jdk1.3.1_03 diff --git a/performance/mobility/test/qa-functional/data/MobileApplicationVisualMIDlet/src/allComponents/VisualMIDletMIDP20.vmd b/performance/mobility/test/qa-functional/data/MobileApplicationVisualMIDlet/src/allComponents/VisualMIDletMIDP20.vmd index fb445cf62..c56c2d377 100644 --- a/performance/mobility/test/qa-functional/data/MobileApplicationVisualMIDlet/src/allComponents/VisualMIDletMIDP20.vmd +++ b/performance/mobility/test/qa-functional/data/MobileApplicationVisualMIDlet/src/allComponents/VisualMIDletMIDP20.vmd @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <VisualDesign projectType="vmd-midp" version="1"> <Document version="2"> <Component componentID="0" typeID="C#Root"> diff --git a/performance/mobility/test/qa-functional/data/MobileApplicationVisualMIDlet/src/simple/VisualMIDlet.vmd b/performance/mobility/test/qa-functional/data/MobileApplicationVisualMIDlet/src/simple/VisualMIDlet.vmd index ad166ce41..f22b9296c 100644 --- a/performance/mobility/test/qa-functional/data/MobileApplicationVisualMIDlet/src/simple/VisualMIDlet.vmd +++ b/performance/mobility/test/qa-functional/data/MobileApplicationVisualMIDlet/src/simple/VisualMIDlet.vmd @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <VisualDesign projectType="vmd-midp" version="1"> <Document version="1"> <Component componentID="0" typeID="C#Root"> diff --git a/performance/sparrow/lib/ext/PLACEHOLDER.txt b/performance/sparrow/lib/ext/PLACEHOLDER.txt index 2bc74a82a..9fe523720 100644 --- a/performance/sparrow/lib/ext/PLACEHOLDER.txt +++ b/performance/sparrow/lib/ext/PLACEHOLDER.txt @@ -1,2 +1,17 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. This directory should hold jcommon and jfreechart.jar, available from sourceforge. There is an ant task in the build script that will download them. diff --git a/performance/sparrow/src/org/netbeans/performance/definitions/PLACEHOLDER.txt b/performance/sparrow/src/org/netbeans/performance/definitions/PLACEHOLDER.txt index 82d796b66..d4ac6123e 100644 --- a/performance/sparrow/src/org/netbeans/performance/definitions/PLACEHOLDER.txt +++ b/performance/sparrow/src/org/netbeans/performance/definitions/PLACEHOLDER.txt @@ -1,3 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. This directory is for XML definitions for charts, queries, filters and so forth once the infrastructure for that is completed. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          740. matthiasblaesing commented on issue #235: [NETBEANS-54] Module Review html.editor URL: https://github.com/apache/incubator-netbeans/pull/235#issuecomment-341914172 For reference: I opened #240 that restores the removed documents mentioned above. Both PRs together should clear the html.editor module completely. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          741. geertjanw commented on issue #225: [NETBEANS-54] exclude .ser files via Rat exclusions URL: https://github.com/apache/incubator-netbeans/pull/225#issuecomment-341920049 It should be OK now. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          742. geertjanw commented on issue #225: [NETBEANS-54] exclude .ser files via Rat exclusions URL: https://github.com/apache/incubator-netbeans/pull/225#issuecomment-341920950 Yes, I used the GitHub web interface, not the command line. I wanted to see if it was possible to use the conflict like that, and it seems to have worked. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          743. geertjanw commented on issue #225: [NETBEANS-54] exclude .ser files via Rat exclusions URL: https://github.com/apache/incubator-netbeans/pull/225#issuecomment-341920950 Yes, I used the GitHub web interface, not the command line. I wanted to see if it was possible to fix the conflict like that, and it seems to have worked. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          744. geertjanw commented on issue #225: [NETBEANS-54] exclude .ser files via Rat exclusions URL: https://github.com/apache/incubator-netbeans/pull/225#issuecomment-341920950 Yes, I used the GitHub web interface, not the command line. I wanted to see if it was possible to fix the conflict like that, and it seems to have worked. It seems to be the officially supported approach by GitHub, since this is the result of using the web interface. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          745. geertjanw commented on issue #225: [NETBEANS-54] exclude .ser files via Rat exclusions URL: https://github.com/apache/incubator-netbeans/pull/225#issuecomment-341922662 @matthiasblaesing, is this safe to merge from your point of view, if not, will just close this and start a new pull request. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          746. matthiasblaesing commented on issue #225: [NETBEANS-54] exclude .ser files via Rat exclusions URL: https://github.com/apache/incubator-netbeans/pull/225#issuecomment-341924911 Yes this looks safe. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          747. geertjanw commented on issue #225: [NETBEANS-54] exclude .ser files via Rat exclusions URL: https://github.com/apache/incubator-netbeans/pull/225#issuecomment-341926516 OK, merging. And if this works without side effects, we’re able to resolve conflicts via GitHub (versus multiple and potentially error prone command line calls), which is nice. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          748. geertjanw closed pull request #225: [NETBEANS-54] exclude .ser files via Rat exclusions URL: https://github.com/apache/incubator-netbeans/pull/225 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/nbbuild/build.xml b/nbbuild/build.xml index 748a7ba0d..18616bc3c 100644 --- a/nbbuild/build.xml +++ b/nbbuild/build.xml @@ -1981,6 +1981,7 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <exclude name="**/*.pass" /> <!--generated test files--> <exclude name="**/*.pass2" /> <!--generated test files--> <exclude name="**/*.ref" /> <!--would cause tests to fail--> + <exclude name="**/*.ser" /> <!--do not natively support comments--> <exclude name="**/*.url" /> <!--no degree of creativity--> <exclude name="**/external/*-license.txt" /> <!--licenses for external dependencies--> <exclude name="**/external/*-notice.txt" /> <!--notices for external dependencies--> @@ -1993,6 +1994,7 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <exclude name="*/build/**" /> <exclude name="*/test/unit/data/**" /> <exclude name="*/test/qa-functional/data/**" /> + <exclude name="autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/updateprovider/data/**" /> <!-- test data --> <exclude name="api.search/test/unit/src/org/netbeans/modules/search/data/**" /> <!--test data--> <exclude name="apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/license-*.txt" /> <!--template file--> <exclude name="beans/src/org/netbeans/modules/beans/resources/templates/*.template" /> <!--license would be visible when users edit the templates inside their IDE--> @@ -2042,6 +2044,9 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <exclude name="o.apache.tools.ant.module/release/VERSION.txt" /> <!--generated file--> <exclude name="o.apache.tools.ant.module/src/org/apache/tools/ant/module/resources/CustomTask_java" /> <!-- user visible file template --> <exclude name="o.apache.tools.ant.module/src/org/apache/tools/ant/module/resources/Project.xml_" /> <!-- user visible file template --> + <exclude name="o.n.core/licenses/**" /> <!-- license files --> + <exclude name="o.n.core/test/unit/src/org/netbeans/core/projects/cache/data/**" /> <!-- test data --> + <exclude name="openide.nodes/test/unit/src/org/openide/nodes/data/**" /> <!-- test data --> <exclude name="options.editor/src/org/netbeans/modules/options/colors/AllLanguagesExample" /> <!--no degree of creativitya--> <exclude name="options.editor/src/org/netbeans/modules/options/colors/HighlightingExample" /> <!--no degree of creativitya--> <exclude name="options.editor/src/org/netbeans/modules/options/indentation/indentationExample" /> <!--no degree of creativitya--> ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          749. matthiasblaesing commented on issue #225: [NETBEANS-54] exclude .ser files via Rat exclusions URL: https://github.com/apache/incubator-netbeans/pull/225#issuecomment-341929759 @geertjanw if it helps you or others I'm ok with this, but I'll stay with the CLI tools, which also happily work with non-github repositories. Remember: sourceforge mostly died because they decided that "free project hosting" does not pay bills and then began to modify projects binaries - if github pulls a stunt like that, I will just go on and work against the apache hosted repository. What is more with the CLI (or other local tools) I can pull from other sources than github, so if contributers don't like github, but host their changes in another public git repository (bitbucket, gitlab, ...) we can still pull their changes. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          750. geertjanw opened a new pull request #242: [NETBEANS-54] exclude files without creativity via Rat exclusions URL: https://github.com/apache/incubator-netbeans/pull/242 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          751. geertjanw commented on issue #242: [NETBEANS-54] exclude files without creativity via Rat exclusions URL: https://github.com/apache/incubator-netbeans/pull/242#issuecomment-341933093 Great, thanks, merging. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          752. geertjanw closed pull request #242: [NETBEANS-54] exclude files without creativity via Rat exclusions URL: https://github.com/apache/incubator-netbeans/pull/242 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/nbbuild/build.xml b/nbbuild/build.xml index 18616bc3c..69ab0f773 100644 --- a/nbbuild/build.xml +++ b/nbbuild/build.xml @@ -1976,10 +1976,14 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d </taskdef> <patternset id="non.rat"> <!--add new one alphabetically--> - <exclude name="**/*.mf" /> <!--do not nativelly support comments--> + <exclude name="**/*.exists" /> <!--no degree of creativity--> + <exclude name="**/*.mf" /> <!--do not natively support comments--> + <exclude name="**/*.MF" /> <!--do not natively support comments--> + <exclude name="**/*.nib" /> <!--do not natively support comments--> <exclude name="**/*.palette_item" /> <!--no degree of creativity--> <exclude name="**/*.pass" /> <!--generated test files--> <exclude name="**/*.pass2" /> <!--generated test files--> + <exclude name="**/*.pbxproj" /> <!--generated test files--> <exclude name="**/*.ref" /> <!--would cause tests to fail--> <exclude name="**/*.ser" /> <!--do not natively support comments--> <exclude name="**/*.url" /> <!--no degree of creativity--> @@ -1992,6 +1996,7 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <exclude name="**/nbproject/private/**" /> <!--user-specific files --> <exclude name="**/src/META-INF/**" /> <!--no degree of creativity--> <exclude name="*/build/**" /> + <exclude name="**/package-list" /> <!--no degree of creativity--> <exclude name="*/test/unit/data/**" /> <exclude name="*/test/qa-functional/data/**" /> <exclude name="autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/updateprovider/data/**" /> <!-- test data --> ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          753. geertjanw opened a new pull request #243: [NETBEANS-54] excluding specific files for various reasons via Rat ex… URL: https://github.com/apache/incubator-netbeans/pull/243 …clusions ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          754. geertjanw opened a new pull request #244: [NETBEANS-54] relicensing 3 files in nbbuild module URL: https://github.com/apache/incubator-netbeans/pull/244 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          755. geertjanw closed pull request #243: [NETBEANS-54] excluding specific files for various reasons via Rat ex… URL: https://github.com/apache/incubator-netbeans/pull/243 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/nbbuild/build.xml b/nbbuild/build.xml index 69ab0f773..225885912 100644 --- a/nbbuild/build.xml +++ b/nbbuild/build.xml @@ -2021,6 +2021,7 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <exclude name="hibernate/src/org/netbeans/modules/hibernate/resources/Hibernate*.xml" /> <!--template files--> <exclude name="hibernate/src/org/netbeans/modules/hibernate/resources/HibernateUtil.javax" /> <!--template file--> <exclude name="hudson.subversion/test/unit/src/org/netbeans/modules/hudson/subversion/sample-entries-file" /> <!--test data--> + <exclude name="ide/launcher/macosx/NetBeansLauncher/ReadMe.rtf" /> <!--does not natively support comments--> <exclude name="j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/resources/*.xsd" /> <!-- XSDs for usage at runtime and code generation - the XSDs are not modified, so covered by https://www.apache.org/legal/resolved.html#category-b --> <exclude name="j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/ui/resources/*.xml" /> <!-- user visible file template --> <exclude name="j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/jpacontroller/resources/*.txt" /> <!-- user visible file template --> @@ -2035,16 +2036,21 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <exclude name="javafx2.kit/release/VERSION.txt" /> <!--generated file--> <exclude name="javafx2.project/src/org/netbeans/modules/javafx2/project/templates/**" /> <!--license would be visible when users edit the templates inside their IDE--> <exclude name="javawebstart/AntTasks/build/**" /> <!-- generated build files --> + <exclude name="jellytools.platform/src/org/netbeans/jellytools/version_info" /> <!--does not natively support comments--> <exclude name="junit.ui/src/org/netbeans/modules/junit/ui/resources/*.template" /> <!--license would be visible when users edit the templates inside their IDE--> <exclude name="languages.diff/src/org/netbeans/modules/languages/diff/DiffExample.diff" /> <!--license would be visible to users in the Fonts/Colors settings--> <exclude name="languages.yaml/src/org/netbeans/modules/languages/yaml/*.yaml" /> <!--Files used in GUI as sample/starting point--> <exclude name="languages.yaml/src/org/netbeans/modules/languages/yaml/*.yml" /> <!--Files used in GUI as sample/starting point--> + <exclude name="lib.uihandler/src/org/netbeans/lib/uihandler/pubKey" /> <!--no degree of creativity--> <exclude name="lib.uihandler/test/unit/src/**" /> <!--test data--> <exclude name="maven.htmlui/src/org/netbeans/modules/maven/htmlui/UIDefaults" /> <!-- config file with no place for license header--> <exclude name="maven.indexer/external/NOTICE-patched-indexer-core-6.0.0" /> <!--no degree of creativity--> <exclude name="mercurial/src/org/netbeans/modules/mercurial/util/log*" /> <!-- user templates for mercurial commits, etc. --> + <exclude name="nbbuild/hudson/.hgmail-profiler" /> <!--no degree of creativity--> + <exclude name="nbbuild/l10n.patterns" /> <!--no degree of creativity--> <exclude name="nbbuild/licenses/**" /> <exclude name="nbbuild/netbeans/**" /> + <exclude name="nbbuild/tagref" /> <!--no degree of creativity--> <exclude name="nbbuild/testuserdir/**" /> <exclude name="o.apache.tools.ant.module/release/VERSION.txt" /> <!--generated file--> <exclude name="o.apache.tools.ant.module/src/org/apache/tools/ant/module/resources/CustomTask_java" /> <!-- user visible file template --> @@ -2052,6 +2058,8 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <exclude name="o.n.core/licenses/**" /> <!-- license files --> <exclude name="o.n.core/test/unit/src/org/netbeans/core/projects/cache/data/**" /> <!-- test data --> <exclude name="openide.nodes/test/unit/src/org/openide/nodes/data/**" /> <!-- test data --> + <exclude name="openide.util.ui/test/unit/src/org/openide/util/UtilitiesTranslateEmpty.txt" /> <!-- license would cause tests to fail --> + <exclude name="openide.util/test/unit/src/org/openide/util/LookupUsesRequestProcessorTest.resource" /> <!-- license would cause tests to fail --> <exclude name="options.editor/src/org/netbeans/modules/options/colors/AllLanguagesExample" /> <!--no degree of creativitya--> <exclude name="options.editor/src/org/netbeans/modules/options/colors/HighlightingExample" /> <!--no degree of creativitya--> <exclude name="options.editor/src/org/netbeans/modules/options/indentation/indentationExample" /> <!--no degree of creativitya--> ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          756. geertjanw closed pull request #244: [NETBEANS-54] relicensing 3 files in nbbuild module URL: https://github.com/apache/incubator-netbeans/pull/244 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/nbbuild/misc/bundlecheck.pl b/nbbuild/misc/bundlecheck.pl index 3a6357636..e8b929f40 100644 --- a/nbbuild/misc/bundlecheck.pl +++ b/nbbuild/misc/bundlecheck.pl @@ -1,46 +1,21 @@ #!/usr/bin/env perl # -*- perl -*- -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. +# http://www.apache.org/licenses/LICENSE-2.0 # -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# Contributor(s): -# -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. require 5.005; use File::Find; diff --git a/nbbuild/misc/bundlewc.pl b/nbbuild/misc/bundlewc.pl index f56834787..9bea7af8f 100644 --- a/nbbuild/misc/bundlewc.pl +++ b/nbbuild/misc/bundlewc.pl @@ -1,46 +1,21 @@ #!/usr/bin/env perl # -*- perl -*- -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. +# http://www.apache.org/licenses/LICENSE-2.0 # -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# Contributor(s): -# -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. $totalwc = 0; $totallc = 0; diff --git a/nbbuild/templates/no-testcoverage.xml b/nbbuild/templates/no-testcoverage.xml index 8f53325a7..007e23371 100644 --- a/nbbuild/templates/no-testcoverage.xml +++ b/nbbuild/templates/no-testcoverage.xml @@ -1,6 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> <project name="no-testcoverage"> <!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + Fallback testcoverage implementation. Just fails with appropriate message. --> ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          757. geertjanw commented on issue #225: [NETBEANS-54] exclude .ser files via Rat exclusions URL: https://github.com/apache/incubator-netbeans/pull/225#issuecomment-341955624 Makes sense. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          758. geertjanw opened a new pull request #245: [NETBEANS-54] excluding files via Rat that would cause tests to fail etc URL: https://github.com/apache/incubator-netbeans/pull/245 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          759. geertjanw closed pull request #245: [NETBEANS-54] excluding files via Rat that would cause tests to fail etc URL: https://github.com/apache/incubator-netbeans/pull/245 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/nbbuild/build.xml b/nbbuild/build.xml index 225885912..b872b021f 100644 --- a/nbbuild/build.xml +++ b/nbbuild/build.xml @@ -1986,7 +1986,10 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <exclude name="**/*.pbxproj" /> <!--generated test files--> <exclude name="**/*.ref" /> <!--would cause tests to fail--> <exclude name="**/*.ser" /> <!--do not natively support comments--> + <exclude name="**/*.sln" /> <!--would cause tests to fail--> <exclude name="**/*.url" /> <!--no degree of creativity--> + <exclude name="**/*.user" /> <!--would cause tests to fail--> + <exclude name="**/*.vcproj" /> <!--would cause tests to fail--> <exclude name="**/external/*-license.txt" /> <!--licenses for external dependencies--> <exclude name="**/external/*-notice.txt" /> <!--notices for external dependencies--> <exclude name="**/nbproject/*.sig" /> <!--generated signatures for past versions--> @@ -1996,9 +1999,12 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <exclude name="**/nbproject/private/**" /> <!--user-specific files --> <exclude name="**/src/META-INF/**" /> <!--no degree of creativity--> <exclude name="*/build/**" /> + <exclude name="**/.dep.inc" /> <!--no degree of creativity--> + <exclude name="**/Makefile-vc" /> <!--no degree of creativity--> + <exclude name="**/Makefile-vc-wo-crt" /> <!--no degree of creativity--> <exclude name="**/package-list" /> <!--no degree of creativity--> - <exclude name="*/test/unit/data/**" /> - <exclude name="*/test/qa-functional/data/**" /> + <exclude name="*/test/unit/data/**" /> <!--would cause tests to fail--> + <exclude name="*/test/qa-functional/data/**" /> <!--would cause tests to fail--> <exclude name="autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/updateprovider/data/**" /> <!-- test data --> <exclude name="api.search/test/unit/src/org/netbeans/modules/search/data/**" /> <!--test data--> <exclude name="apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/license-*.txt" /> <!--template file--> @@ -2051,7 +2057,10 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <exclude name="nbbuild/licenses/**" /> <exclude name="nbbuild/netbeans/**" /> <exclude name="nbbuild/tagref" /> <!--no degree of creativity--> + <exclude name="nbbuild/notice-stub.txt" /> <!--Apache notice file--> + <exclude name="nbbuild/standard-nbm-license.txt" /> <!--license file--> <exclude name="nbbuild/testuserdir/**" /> + <exclude name="nbi/engine/nbproject/profiler-build-impl.xml" /> <!--generated, no degree of creativity --> <exclude name="o.apache.tools.ant.module/release/VERSION.txt" /> <!--generated file--> <exclude name="o.apache.tools.ant.module/src/org/apache/tools/ant/module/resources/CustomTask_java" /> <!-- user visible file template --> <exclude name="o.apache.tools.ant.module/src/org/apache/tools/ant/module/resources/Project.xml_" /> <!-- user visible file template --> ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          760. geertjanw opened a new pull request #246: [NETBEANS-54] excluding 8 files without creativity via Rat URL: https://github.com/apache/incubator-netbeans/pull/246 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          761. geertjanw closed pull request #246: [NETBEANS-54] excluding 8 files without creativity via Rat URL: https://github.com/apache/incubator-netbeans/pull/246 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/nbbuild/build.xml b/nbbuild/build.xml index b872b021f..034041752 100644 --- a/nbbuild/build.xml +++ b/nbbuild/build.xml @@ -2064,9 +2064,17 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <exclude name="o.apache.tools.ant.module/release/VERSION.txt" /> <!--generated file--> <exclude name="o.apache.tools.ant.module/src/org/apache/tools/ant/module/resources/CustomTask_java" /> <!-- user visible file template --> <exclude name="o.apache.tools.ant.module/src/org/apache/tools/ant/module/resources/Project.xml_" /> <!-- user visible file template --> + <exclude name="o.n.bootstrap/test/unit/src/org/fakepkg/resource1.txt" /> <!--no degree of creativity--> + <exclude name="o.n.bootstrap/test/unit/src/org/fakepkg/resource2.txt" /> <!--no degree of creativity--> <exclude name="o.n.core/licenses/**" /> <!-- license files --> + <exclude name="o.n.core/test/unit/src/org/netbeans/core/modules/jars/localized-manifest/locmani/something.txt" /> <!--no degree of creativity--> <exclude name="o.n.core/test/unit/src/org/netbeans/core/projects/cache/data/**" /> <!-- test data --> <exclude name="openide.nodes/test/unit/src/org/openide/nodes/data/**" /> <!-- test data --> + <exclude name="openide.util.lookup/test/unit/src/org/openide/util/lookup/MetaInfServicesLookupTestRunnable.txt" /> <!--no degree of creativity--> + <exclude name="openide.util.lookup/test/unit/src/org/openide/util/lookup/problem100320.txt" /> <!--no degree of creativity--> + <exclude name="openide.util.lookup/test/unit/src/org/openide/util/lookup/problem249414.txt" /> <!--no degree of creativity--> + <exclude name="openide.util.lookup/test/unit/src/org/openide/util/lookup/services-jar-1.txt" /> <!--no degree of creativity--> + <exclude name="openide.util.lookup/test/unit/src/org/openide/util/lookup/services-jar-2.txt" /> <!--no degree of creativity--> <exclude name="openide.util.ui/test/unit/src/org/openide/util/UtilitiesTranslateEmpty.txt" /> <!-- license would cause tests to fail --> <exclude name="openide.util/test/unit/src/org/openide/util/LookupUsesRequestProcessorTest.resource" /> <!-- license would cause tests to fail --> <exclude name="options.editor/src/org/netbeans/modules/options/colors/AllLanguagesExample" /> <!--no degree of creativitya--> ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          762. borxa commented on issue #235: [NETBEANS-54] Module Review html.editor URL: https://github.com/apache/incubator-netbeans/pull/235#issuecomment-341996028 License from catalog files removed ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          763. asfgit closed pull request #235: [NETBEANS-54] Module Review html.editor URL: https://github.com/apache/incubator-netbeans/pull/235 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/html.editor/src/org/netbeans/modules/html/editor/Bundle.properties b/html.editor/src/org/netbeans/modules/html/editor/Bundle.properties index 93afa1306..2a219fdfb 100644 --- a/html.editor/src/org/netbeans/modules/html/editor/Bundle.properties +++ b/html.editor/src/org/netbeans/modules/html/editor/Bundle.properties @@ -1,44 +1,19 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. - -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" - -# Contributor(s): - -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun -# Microsystems, Inc. All Rights Reserved. - -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. HtmlCompletionOptionsPanel.autocompleteQuotesAfterEQSCheckBox.text=Equals-sign (=) Keypress After Attribute Name Autocompletes Quote Set HtmlCompletionOptionsPanel.autocompleteQuotesCheckBox.text=Quote-mark (") Keypress After Attribute Name Autocompletes Closing Quote HtmlCompletionOptionsPanel.completionOffersEndTagAfterLt.text=Completion Offers End Tags After Less Than (<) Character diff --git a/html.editor/src/org/netbeans/modules/html/editor/hints/Bundle.properties b/html.editor/src/org/netbeans/modules/html/editor/hints/Bundle.properties index ab4dc3874..ea391606a 100644 --- a/html.editor/src/org/netbeans/modules/html/editor/hints/Bundle.properties +++ b/html.editor/src/org/netbeans/modules/html/editor/hints/Bundle.properties @@ -1,44 +1,19 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 # -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. - -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" - -# Contributor(s): - -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun -# Microsystems, Inc. All Rights Reserved. - -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. #Options csl-hints/text/html/hints/general=HTML Validator diff --git a/html.editor/src/org/netbeans/modules/html/editor/hints/css/Bundle.properties b/html.editor/src/org/netbeans/modules/html/editor/hints/css/Bundle.properties index dd1b3f995..1f239219b 100644 --- a/html.editor/src/org/netbeans/modules/html/editor/hints/css/Bundle.properties +++ b/html.editor/src/org/netbeans/modules/html/editor/hints/css/Bundle.properties @@ -1,44 +1,19 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. - -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" - -# Contributor(s): - -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun -# Microsystems, Inc. All Rights Reserved. - -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. #Options csl-hints/text/html/hints/css=CSS ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          764. matthiasblaesing commented on issue #235: [NETBEANS-54] Module Review html.editor URL: https://github.com/apache/incubator-netbeans/pull/235#issuecomment-342001268 Thank you - I added the excludes for the build.xml and merged this. html.editor is now clean. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          765. junichi11 commented on issue #207: [NETBEANS-54] Module Review o.n.upgrader URL: https://github.com/apache/incubator-netbeans/pull/207#issuecomment-342379117 I'll merge this later. Please let me know if there is a problem. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          766. junichi11 opened a new pull request #255: [NETBEANS-54] Module Review api.templates URL: https://github.com/apache/incubator-netbeans/pull/255 - Remove the license header from utf8.xml because unit tests fail. - Exclude utf8.xml from rat. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          767. junichi11 closed pull request #207: [NETBEANS-54] Module Review o.n.upgrader URL: https://github.com/apache/incubator-netbeans/pull/207 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/systemoptionsimport b/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/systemoptionsimport index 6caf84336..d30b68ebd 100644 --- a/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/systemoptionsimport +++ b/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/systemoptionsimport @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. Services/org-netbeans-core-IDESettings.settings Services/org-netbeans-modules-derby-DerbyOptions.settings Services/org-apache-tools-ant-module-AntSettings.settings ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          768. junichi11 closed pull request #255: [NETBEANS-54] Module Review api.templates URL: https://github.com/apache/incubator-netbeans/pull/255 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/api.templates/test/unit/src/org/netbeans/modules/templates/utf8.xml b/api.templates/test/unit/src/org/netbeans/modules/templates/utf8.xml index 5bddc48f0..b508d10e4 100644 --- a/api.templates/test/unit/src/org/netbeans/modules/templates/utf8.xml +++ b/api.templates/test/unit/src/org/netbeans/modules/templates/utf8.xml @@ -1,24 +1,3 @@ -<!-- - - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. - ---> - print('<?xml version="1.0"?>'); print('<root>'); print(' Žluťoučký kůň skákal přes čtvero mezí.'); diff --git a/nbbuild/build.xml b/nbbuild/build.xml index db1024677..11c14a173 100644 --- a/nbbuild/build.xml +++ b/nbbuild/build.xml @@ -2005,9 +2005,10 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <exclude name="**/package-list" /> <!--no degree of creativity--> <exclude name="*/test/unit/data/**" /> <!--would cause tests to fail--> <exclude name="*/test/qa-functional/data/**" /> <!--would cause tests to fail--> - <exclude name="autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/updateprovider/data/**" /> <!-- test data --> <exclude name="api.search/test/unit/src/org/netbeans/modules/search/data/**" /> <!--test data--> + <exclude name="api.templates/test/unit/src/org/netbeans/modules/templates/utf8.xml" /> <!--test data--> <exclude name="apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/license-*.txt" /> <!--template file--> + <exclude name="autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/updateprovider/data/**" /> <!-- test data --> <exclude name="beans/src/org/netbeans/modules/beans/resources/templates/*.template" /> <!--license would be visible when users edit the templates inside their IDE--> <exclude name="css.editor/src/org/netbeans/modules/css/resources/CascadeStyleSheet.css.template" /> <!-- user visible template --> <exclude name="css.editor/src/org/netbeans/modules/css/resources/CssExample" /> <!-- user visible template --> ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          769. geertjanw opened a new pull request #271: [NETBEANS-54] excluding specific files, e.g., licenses via Rat URL: https://github.com/apache/incubator-netbeans/pull/271 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          770. geertjanw commented on issue #218: [NETBEANS-54] Module Review xml.jaxb URL: https://github.com/apache/incubator-netbeans/pull/218#issuecomment-343731008 Reverted the license header changes on the test data files. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          771. matthiasblaesing opened a new pull request #272: [NETBEANS-54] Further license cleanup URL: https://github.com/apache/incubator-netbeans/pull/272 There are two changes: - cleanup the xml.jaxb module by moving test-data into `xml.jaxb/test/unit/data` and fix the remaining files in the modules - cleanup modules where the CDDL is still present in primary or secondary (file generation) elements ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          772. matthiasblaesing commented on issue #218: [NETBEANS-54] Module Review xml.jaxb URL: https://github.com/apache/incubator-netbeans/pull/218#issuecomment-343739147 @geertjanw you latest change reverts all changes you did to the xml.jaxb module. As this looked abandond I had a look at it yesterday and also covered a few more files. Please have a look at PR #272 which holds both changesets. Merging that would also close this PR. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          773. matthiasblaesing commented on a change in pull request #271: [NETBEANS-54] excluding specific files, e.g., licenses via Rat URL: https://github.com/apache/incubator-netbeans/pull/271#discussion_r150411500 ########## File path: nbbuild/build.xml ########## @@ -2024,8 +2027,11 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <exclude name="editor.plain/src/org/netbeans/modules/editor/plain/resources/PlainTextExample" /> <!--license would be visible to users in the Fonts/Colors settings--> <exclude name="editor.settings.storage/test/unit/src/org/netbeans/modules/editor/settings/storage/compatibility/p1/**" /> <!--test data--> <exclude name="extbrowser/test/unit/src/org/netbeans/modules/extbrowser/data/mac_defaults_*" /> <!--test data--> + <exclude name="form/src/org/netbeans/modules/form/resources/templates/**" /> <!--template files--> <exclude name="hibernate/src/org/netbeans/modules/hibernate/resources/Hibernate*.xml" /> <!--template files--> <exclude name="hibernate/src/org/netbeans/modules/hibernate/resources/HibernateUtil.javax" /> <!--template file--> + <exclude name="html/src/org/netbeans/modules/html/templates/**" /> <!--template files--> Review comment: This should not be here. The license header there is CDDL-GPL-2-CP and needs to be adjusted. I fixed that in #272. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          774. matthiasblaesing closed pull request #272: [NETBEANS-54] Further license cleanup URL: https://github.com/apache/incubator-netbeans/pull/272 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/api.htmlui/test/unit/src/org/netbeans/api/htmlui/empty.html b/api.htmlui/test/unit/src/org/netbeans/api/htmlui/empty.html index 36d74b74b..7f152d47c 100644 --- a/api.htmlui/test/unit/src/org/netbeans/api/htmlui/empty.html +++ b/api.htmlui/test/unit/src/org/netbeans/api/htmlui/empty.html @@ -19,47 +19,6 @@ --> <!DOCTYPE html> -<!-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -Copyright 2014 Oracle and/or its affiliates. All rights reserved. - -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. - -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" - -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): - -Portions Copyrighted 2014 Sun Microsystems, Inc. ---> <html> <head> <title>TODO supply a title</title> diff --git a/beans/src/org/netbeans/modules/beans/resources/beansSetting.gif b/beans/src/org/netbeans/modules/beans/resources/beansSetting.gif deleted file mode 100644 index b09c4afe5..000000000 Binary files a/beans/src/org/netbeans/modules/beans/resources/beansSetting.gif and /dev/null differ diff --git a/gsf.testrunner.ui/src/META-INF/netbeans/translate.names b/gsf.testrunner.ui/src/META-INF/netbeans/translate.names index 1a8b11322..0308f66da 100644 --- a/gsf.testrunner.ui/src/META-INF/netbeans/translate.names +++ b/gsf.testrunner.ui/src/META-INF/netbeans/translate.names @@ -1,39 +1,20 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved. -# -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. +# http://www.apache.org/licenses/LICENSE-2.0 # +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + # Contributor(s): # Changed filename of actions Actions/UnitTests/org-netbeans-modules-gsf-testrunner-TestCreatorAction.instance=Actions/UnitTests/org-netbeans-modules-gsf-testrunner-ui-TestCreatorAction.instance diff --git a/gsf.testrunner/src/META-INF/netbeans/translate.names b/gsf.testrunner/src/META-INF/netbeans/translate.names index 8a4d6cee6..f0cb86c4d 100644 --- a/gsf.testrunner/src/META-INF/netbeans/translate.names +++ b/gsf.testrunner/src/META-INF/netbeans/translate.names @@ -1,40 +1,20 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved. +# http://www.apache.org/licenses/LICENSE-2.0 # -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. -# -# Contributor(s): +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + # Changed filename of actions Actions/JUnitTests/org-netbeans-modules-junit-CreateTestAction.instance=Actions/UnitTests/org-netbeans-modules-gsf-testrunner-TestCreatorAction.instance Actions/JUnitTests/org-netbeans-modules-junit-actions-RunTestMethodAction.instance=Actions/CommonTestRunner/org-netbeans-modules-gsf-testrunner-TestMethodRunnerAction.instance diff --git a/html/src/org/netbeans/modules/html/templates/html.html b/html/src/org/netbeans/modules/html/templates/html.html index 31d550dc0..3be05ddd4 100644 --- a/html/src/org/netbeans/modules/html/templates/html.html +++ b/html/src/org/netbeans/modules/html/templates/html.html @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> ${doctype} <#assign licenseFirst = "<!--"> diff --git a/html/src/org/netbeans/modules/html/templates/xhtml.xhtml b/html/src/org/netbeans/modules/html/templates/xhtml.xhtml index a3d6bab8f..430b344e4 100644 --- a/html/src/org/netbeans/modules/html/templates/xhtml.xhtml +++ b/html/src/org/netbeans/modules/html/templates/xhtml.xhtml @@ -1,42 +1,23 @@ <?xml version="1.0" encoding="${encoding}"?> <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. + http://www.apache.org/licenses/LICENSE-2.0 -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): --> <#assign licenseFirst = "<!--"> <#assign licensePrefix = ""> diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-binaries b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-binaries index 6f6c60da6..b283ee14f 100644 --- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-binaries +++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-binaries @@ -49,9 +49,6 @@ derby/release/modules/ext/derbysampledb.zip # Not distributed with product, only used during build: nbbuild/external/apitest*.jar -# Developed under CDDL inside nb.org (later snapshot moved to dev.java.net): -apisupport.paintapp/PaintApp-suite/ColorChooser/release/modules/ext/ColorChooser.jar - # Build by NetBeans team mobility.databindingme/lib/* diff --git a/performance.java/test/qa-functional/data/PerformanceTestData/src/org/netbeans/test/performance/Bundle.properties b/performance.java/test/qa-functional/data/PerformanceTestData/src/org/netbeans/test/performance/Bundle.properties index a04b1907a..48479befb 100644 --- a/performance.java/test/qa-functional/data/PerformanceTestData/src/org/netbeans/test/performance/Bundle.properties +++ b/performance.java/test/qa-functional/data/PerformanceTestData/src/org/netbeans/test/performance/Bundle.properties @@ -1,19 +1,19 @@ -# The contents of this file are subject to the terms of the Common Development -# and Distribution License (the License). You may not use this file except in -# compliance with the License. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# You can obtain a copy of the License at http://www.netbeans.org/cddl.html -# or http://www.netbeans.org/cddl.txt. +# http://www.apache.org/licenses/LICENSE-2.0 # -# When distributing Covered Code, include this CDDL Header Notice in each file -# and include the License file at http://www.netbeans.org/cddl.txt. -# If applicable, add the following below the CDDL Header, with the fields -# enclosed by brackets [] replaced by your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun -# Microsystems, Inc. All Rights Reserved. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. # VERSIONING (TopLogging, MainWindow) # {0} - build number diff --git a/performance.java/test/qa-functional/data/PerformanceTestData/src/org/netbeans/test/performance/Bundle20kB.properties b/performance.java/test/qa-functional/data/PerformanceTestData/src/org/netbeans/test/performance/Bundle20kB.properties index 7a5928918..f8d66637c 100644 --- a/performance.java/test/qa-functional/data/PerformanceTestData/src/org/netbeans/test/performance/Bundle20kB.properties +++ b/performance.java/test/qa-functional/data/PerformanceTestData/src/org/netbeans/test/performance/Bundle20kB.properties @@ -1,19 +1,19 @@ -# The contents of this file are subject to the terms of the Common Development -# and Distribution License (the License). You may not use this file except in -# compliance with the License. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# You can obtain a copy of the License at http://www.netbeans.org/cddl.html -# or http://www.netbeans.org/cddl.txt. +# http://www.apache.org/licenses/LICENSE-2.0 # -# When distributing Covered Code, include this CDDL Header Notice in each file -# and include the License file at http://www.netbeans.org/cddl.txt. -# If applicable, add the following below the CDDL Header, with the fields -# enclosed by brackets [] replaced by your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun -# Microsystems, Inc. All Rights Reserved. +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. # VERSIONING (TopLogging, MainWindow) # {0} - build number diff --git a/refactoring.java/test/qa-functional/data/goldenfiles/org/netbeans/modules/test/refactoring/MoveTest/testMoveClass.pass b/refactoring.java/test/qa-functional/data/goldenfiles/org/netbeans/modules/test/refactoring/MoveTest/testMoveClass.pass index baf97ce82..a2f8a3e43 100644 --- a/refactoring.java/test/qa-functional/data/goldenfiles/org/netbeans/modules/test/refactoring/MoveTest/testMoveClass.pass +++ b/refactoring.java/test/qa-functional/data/goldenfiles/org/netbeans/modules/test/refactoring/MoveTest/testMoveClass.pass @@ -34,46 +34,23 @@ public class Reference { } } ==>StatRef -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2012 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * Contributor(s): + * http://www.apache.org/licenses/LICENSE-2.0 * - *** Portions Copyrighted 2008 Sun Microsystems, Inc. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package moveSource; diff --git a/refactoring.java/test/qa-functional/data/goldenfiles/org/netbeans/modules/test/refactoring/RenameTest/testRenameClass.pass b/refactoring.java/test/qa-functional/data/goldenfiles/org/netbeans/modules/test/refactoring/RenameTest/testRenameClass.pass index 6f4ab0d12..b5a5fa803 100644 --- a/refactoring.java/test/qa-functional/data/goldenfiles/org/netbeans/modules/test/refactoring/RenameTest/testRenameClass.pass +++ b/refactoring.java/test/qa-functional/data/goldenfiles/org/netbeans/modules/test/refactoring/RenameTest/testRenameClass.pass @@ -32,46 +32,23 @@ public class Renamed { } Created file: ==>Renamed.java -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2012 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * Contributor(s): + * http://www.apache.org/licenses/LICENSE-2.0 * - * Portions Copyrighted 2012 Sun Microsystems, Inc. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package renameClass; diff --git a/refactoring.java/test/qa-functional/data/goldenfiles/org/netbeans/modules/test/refactoring/RenameTest/testRenameCtor.pass b/refactoring.java/test/qa-functional/data/goldenfiles/org/netbeans/modules/test/refactoring/RenameTest/testRenameCtor.pass index fd04b1771..7b3e8f0c4 100644 --- a/refactoring.java/test/qa-functional/data/goldenfiles/org/netbeans/modules/test/refactoring/RenameTest/testRenameCtor.pass +++ b/refactoring.java/test/qa-functional/data/goldenfiles/org/netbeans/modules/test/refactoring/RenameTest/testRenameCtor.pass @@ -36,46 +36,23 @@ public class RenamedCtor { } Created file: ==>RenamedCtor.java -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2012 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * Contributor(s): + * http://www.apache.org/licenses/LICENSE-2.0 * - * Portions Copyrighted 2008 Sun Microsystems, Inc. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package renameClass; diff --git a/refactoring.java/test/qa-functional/data/goldenfiles/org/netbeans/modules/test/refactoring/RenameTest/testRenamePackage.pass b/refactoring.java/test/qa-functional/data/goldenfiles/org/netbeans/modules/test/refactoring/RenameTest/testRenamePackage.pass index b1ed9b72d..c0599eb19 100644 --- a/refactoring.java/test/qa-functional/data/goldenfiles/org/netbeans/modules/test/refactoring/RenameTest/testRenamePackage.pass +++ b/refactoring.java/test/qa-functional/data/goldenfiles/org/netbeans/modules/test/refactoring/RenameTest/testRenamePackage.pass @@ -32,46 +32,23 @@ Created directory: /renamedPkg Created file: ==>RenamePkg.java -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2012 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * Contributor(s): + * http://www.apache.org/licenses/LICENSE-2.0 * - * Portions Copyrighted 2012 Sun Microsystems, Inc. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package renamedPkg; diff --git a/schema2beans/test/unit/data/TestGroupUnbounded.java b/schema2beans/test/unit/data/TestGroupUnbounded.java index 1cb1d2089..e2bf10536 100644 --- a/schema2beans/test/unit/data/TestGroupUnbounded.java +++ b/schema2beans/test/unit/data/TestGroupUnbounded.java @@ -1,42 +1,20 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved. + * http://www.apache.org/licenses/LICENSE-2.0 * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * Contributor(s): - * - * The Original Software is NetBeans. The Initial Developer of the original - * Code is Sun Microsystems, Inc. PGroupUnboundedtions Copyright 1997-2006 Sun - * Microsystems, Inc. All Rights Reserved. - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ import java.io.*; diff --git a/subversion/src/org/netbeans/modules/subversion/ui/wizards/importstep/Bundle.properties b/subversion/src/org/netbeans/modules/subversion/ui/wizards/importstep/Bundle.properties index ac7c03956..fcbf5d9df 100644 --- a/subversion/src/org/netbeans/modules/subversion/ui/wizards/importstep/Bundle.properties +++ b/subversion/src/org/netbeans/modules/subversion/ui/wizards/importstep/Bundle.properties @@ -1,40 +1,20 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved. +# http://www.apache.org/licenses/LICENSE-2.0 # -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. -# -# Contributor(s): +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + ## ImportStep.java BK2014=Repository Folder must be specified diff --git a/xml.jaxb/src/org/netbeans/modules/xml/jaxb/CodeTemplates.xml b/xml.jaxb/src/org/netbeans/modules/xml/jaxb/CodeTemplates.xml index 450ba66c1..36bfc2bf3 100644 --- a/xml.jaxb/src/org/netbeans/modules/xml/jaxb/CodeTemplates.xml +++ b/xml.jaxb/src/org/netbeans/modules/xml/jaxb/CodeTemplates.xml @@ -1,4 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> <!DOCTYPE codetemplates PUBLIC "-//NetBeans//DTD Editor Code Templates settings 1.0//EN" "http://www.netbeans.org/dtds/EditorCodeTemplates-1_0.dtd"> <codetemplates> <codetemplate abbreviation="jaxbm" xml:space="preserve"> diff --git a/xml.jaxb/src/org/netbeans/modules/xml/jaxb/ui/Bundle.properties b/xml.jaxb/src/org/netbeans/modules/xml/jaxb/ui/Bundle.properties index aa8077f47..259d5a89a 100644 --- a/xml.jaxb/src/org/netbeans/modules/xml/jaxb/ui/Bundle.properties +++ b/xml.jaxb/src/org/netbeans/modules/xml/jaxb/ui/Bundle.properties @@ -1,40 +1,20 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved. +# http://www.apache.org/licenses/LICENSE-2.0 # -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. -# -# Contributor(s): +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + # Labels LBL_JAXBWizTitle=Configure XML Binding LBL_XSDFileLoc=XSD File Location\: diff --git a/xml.jaxb/test/unit/src/data/BuildFile1.xml b/xml.jaxb/test/unit/data/org/netbeans/modules/xml/jaxb/util/BuildFile1.xml similarity index 100% rename from xml.jaxb/test/unit/src/data/BuildFile1.xml rename to xml.jaxb/test/unit/data/org/netbeans/modules/xml/jaxb/util/BuildFile1.xml diff --git a/xml.jaxb/test/unit/src/data/BuildFile2.xml b/xml.jaxb/test/unit/data/org/netbeans/modules/xml/jaxb/util/BuildFile2.xml similarity index 100% rename from xml.jaxb/test/unit/src/data/BuildFile2.xml rename to xml.jaxb/test/unit/data/org/netbeans/modules/xml/jaxb/util/BuildFile2.xml diff --git a/xml.jaxb/test/unit/src/data/BuildFile3.xml b/xml.jaxb/test/unit/data/org/netbeans/modules/xml/jaxb/util/BuildFile3.xml similarity index 100% rename from xml.jaxb/test/unit/src/data/BuildFile3.xml rename to xml.jaxb/test/unit/data/org/netbeans/modules/xml/jaxb/util/BuildFile3.xml diff --git a/xml.jaxb/test/unit/src/data/BuildFileEmptyCatalog.xml b/xml.jaxb/test/unit/data/org/netbeans/modules/xml/jaxb/util/BuildFileEmptyCatalog.xml similarity index 100% rename from xml.jaxb/test/unit/src/data/BuildFileEmptyCatalog.xml rename to xml.jaxb/test/unit/data/org/netbeans/modules/xml/jaxb/util/BuildFileEmptyCatalog.xml diff --git a/xml.jaxb/test/unit/src/data/ConfigFile1.xml b/xml.jaxb/test/unit/data/org/netbeans/modules/xml/jaxb/util/ConfigFile1.xml similarity index 100% rename from xml.jaxb/test/unit/src/data/ConfigFile1.xml rename to xml.jaxb/test/unit/data/org/netbeans/modules/xml/jaxb/util/ConfigFile1.xml diff --git a/xml.jaxb/test/unit/src/data/ConfigFile2.xml b/xml.jaxb/test/unit/data/org/netbeans/modules/xml/jaxb/util/ConfigFile2.xml similarity index 100% rename from xml.jaxb/test/unit/src/data/ConfigFile2.xml rename to xml.jaxb/test/unit/data/org/netbeans/modules/xml/jaxb/util/ConfigFile2.xml diff --git a/xml.jaxb/test/unit/src/data/ConfigFile3.xml b/xml.jaxb/test/unit/data/org/netbeans/modules/xml/jaxb/util/ConfigFile3.xml similarity index 100% rename from xml.jaxb/test/unit/src/data/ConfigFile3.xml rename to xml.jaxb/test/unit/data/org/netbeans/modules/xml/jaxb/util/ConfigFile3.xml diff --git a/xml.jaxb/test/unit/src/data/ConfigFileEmptyCatalog.xml b/xml.jaxb/test/unit/data/org/netbeans/modules/xml/jaxb/util/ConfigFileEmptyCatalog.xml similarity index 100% rename from xml.jaxb/test/unit/src/data/ConfigFileEmptyCatalog.xml rename to xml.jaxb/test/unit/data/org/netbeans/modules/xml/jaxb/util/ConfigFileEmptyCatalog.xml diff --git a/xml.jaxb/test/unit/src/org/netbeans/modules/xml/jaxb/util/XSLTest.java b/xml.jaxb/test/unit/src/org/netbeans/modules/xml/jaxb/util/XSLTest.java index 991bd02b4..bfacec5a3 100644 --- a/xml.jaxb/test/unit/src/org/netbeans/modules/xml/jaxb/util/XSLTest.java +++ b/xml.jaxb/test/unit/src/org/netbeans/modules/xml/jaxb/util/XSLTest.java @@ -22,6 +22,7 @@ import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; +import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; @@ -45,16 +46,14 @@ * @author gmpatil */ public class XSLTest extends NbTestCase { - private static final String CONFIG_FILE1 = "/data/ConfigFile1.xml"; //NOI18N - private static final String CONFIG_FILE2 = "/data/ConfigFile2.xml"; //NOI18N - private static final String CONFIG_FILE3 = "/data/ConfigFile3.xml"; //NOI18N - private static final String CONFIG_EMPTY_CAT = - "/data/ConfigFileEmptyCatalog.xml"; //NOI18N - private static final String BUILD_FILE1 = "/data/BuildFile1.xml"; //NOI18N - private static final String BUILD_FILE2 = "/data/BuildFile2.xml"; //NOI18N - private static final String BUILD_FILE3 = "/data/BuildFile3.xml"; //NOI18N - private static final String BUILD_EMPTY_CAT = - "/data/BuildFileEmptyCatalog.xml"; //NOI18N + private static final String CONFIG_FILE1 = "ConfigFile1.xml"; //NOI18N + private static final String CONFIG_FILE2 = "ConfigFile2.xml"; //NOI18N + private static final String CONFIG_FILE3 = "ConfigFile3.xml"; //NOI18N + private static final String CONFIG_EMPTY_CAT = "ConfigFileEmptyCatalog.xml"; //NOI18N + private static final String BUILD_FILE1 = "BuildFile1.xml"; //NOI18N + private static final String BUILD_FILE2 = "BuildFile2.xml"; //NOI18N + private static final String BUILD_FILE3 = "BuildFile3.xml"; //NOI18N + private static final String BUILD_EMPTY_CAT = "BuildFileEmptyCatalog.xml"; //NOI18N private static final String XSL_FILE = "/org/netbeans/modules/xml/jaxb/resources/JAXBBuild.xsl"; //NOI18N @@ -70,10 +69,15 @@ public void setUp() throws Exception { public void tearDown() throws Exception { } - private InputStream getInputStream(String filePath){ + private InputStream getFromClasspath(String filePath){ return this.getClass().getResourceAsStream(filePath); } + private InputStream getDatafile(String filename) throws FileNotFoundException{ + String dataFilename = "/org/netbeans/modules/xml/jaxb/util/" + filename; + return new FileInputStream(new File(getDataDir(), dataFilename)); + } + private String getString(InputStream stream) throws IOException{ BufferedReader br = new BufferedReader(new InputStreamReader(stream)); StringBuffer sb = new StringBuffer(); @@ -100,8 +104,8 @@ private void compareStream(InputStream file1, InputStream file2) throws IOExcept private void transformConfig2Build(String configFile, String buildFile){ try { - Source xmlSource = new StreamSource(getInputStream(configFile)); - Source xslSource = new StreamSource(getInputStream(XSL_FILE)); + Source xmlSource = new StreamSource(getDatafile(configFile)); + Source xslSource = new StreamSource(getFromClasspath(XSL_FILE)); File tmpFile = java.io.File.createTempFile(TEMP_BUILD_FILE, ".xml"); //System.out.println("tmpFile:" + tmpFile.getAbsolutePath()); tmpFile.deleteOnExit(); @@ -115,7 +119,7 @@ private void transformConfig2Build(String configFile, String buildFile){ xformer.transform(xmlSource, result); // Compare. fos.close(); - compareStream(getInputStream(buildFile), new FileInputStream(tmpFile)); + compareStream(getDatafile(buildFile), new FileInputStream(tmpFile)); } catch (TransformerConfigurationException ex) { Logger.getLogger("global").log(Level.SEVERE, null, ex); fail("TransformerConfigurationException"); diff --git a/xml.tax/lib/test/qa-functional/src/org/netbeans/tax/io/data/goldenfiles/TreeBuilderTest/testAttlistWithRefsInstance.pass b/xml.tax/lib/test/qa-functional/src/org/netbeans/tax/io/data/goldenfiles/TreeBuilderTest/testAttlistWithRefsInstance.pass index 7a35d3f63..e454392aa 100644 --- a/xml.tax/lib/test/qa-functional/src/org/netbeans/tax/io/data/goldenfiles/TreeBuilderTest/testAttlistWithRefsInstance.pass +++ b/xml.tax/lib/test/qa-functional/src/org/netbeans/tax/io/data/goldenfiles/TreeBuilderTest/testAttlistWithRefsInstance.pass @@ -45,22 +45,24 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- -The contents of this file are subject to the terms of the Common Development -and Distribution License (the License). You may not use this file except in -compliance with the License. - -You can obtain a copy of the License at http://www.netbeans.org/cddl.html -or http://www.netbeans.org/cddl.txt. - -When distributing Covered Code, include this CDDL Header Notice in each file -and include the License file at http://www.netbeans.org/cddl.txt. -If applicable, add the following below the CDDL Header, with the fields -enclosed by brackets [] replaced by your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" - -The Original Software is NetBeans. The Initial Developer of the Original -Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun -Microsystems, Inc. All Rights Reserved. + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + --> <!-- Created by pk97937 on June 21, 2001, 4:23 PM --> diff --git a/xml.text/src/org/netbeans/modules/xml/text/syntax/javacc/DTDSyntax.jj b/xml.text/src/org/netbeans/modules/xml/text/syntax/javacc/DTDSyntax.jj index fa7f72b80..664d995ed 100644 --- a/xml.text/src/org/netbeans/modules/xml/text/syntax/javacc/DTDSyntax.jj +++ b/xml.text/src/org/netbeans/modules/xml/text/syntax/javacc/DTDSyntax.jj @@ -61,44 +61,23 @@ options { PARSER_BEGIN(DTDSyntax) -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright (c) 1997, 2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Contributor(s): + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.netbeans.modules.xml.text.syntax.javacc; diff --git a/xml.text/src/org/netbeans/modules/xml/text/syntax/javacc/XMLSyntax.jj b/xml.text/src/org/netbeans/modules/xml/text/syntax/javacc/XMLSyntax.jj index 26deb7479..78c10935a 100644 --- a/xml.text/src/org/netbeans/modules/xml/text/syntax/javacc/XMLSyntax.jj +++ b/xml.text/src/org/netbeans/modules/xml/text/syntax/javacc/XMLSyntax.jj @@ -60,44 +60,23 @@ options { PARSER_BEGIN(XMLSyntax) -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright (c) 1997, 2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Contributor(s): + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.netbeans.modules.xml.text.syntax.javacc; diff --git a/xml/bin/gen-icons_xml.sh b/xml/bin/gen-icons_xml.sh index c0a0a0de3..c4efc4f93 100644 --- a/xml/bin/gen-icons_xml.sh +++ b/xml/bin/gen-icons_xml.sh @@ -48,87 +48,45 @@ for dir in api catalog core css tax text-edit tools tree-edit xsl schema; do if [ "$GENERATE" == "true" ]; then DESC_FILE=$ICONS/description.properties - echo "# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -# -# Copyright 1997, 2010 Oracle and/or its affiliates. All rights reserved. -# -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" + echo "# \ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at # -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. +# http://www.apache.org/licenses/LICENSE-2.0 # -# Contributor(s): +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. " > $DESC_FILE fi DATA=$WWW/$dir/data/icons.xml echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?> <!-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -Copyright 1997, 2010 Oracle and/or its affiliates. All rights reserved. - -Oracle and Java are registered trademarks of Oracle and/or its affiliates. -Other names may be trademarks of their respective owners. - -The contents of this file are subject to the terms of either the GNU -General Public License Version 2 only ("GPL") or the Common -Development and Distribution License("CDDL") (collectively, the -"License"). You may not use this file except in compliance with the -License. You can obtain a copy of the License at -http://www.netbeans.org/cddl-gplv2.html -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -specific language governing permissions and limitations under the -License. When distributing the software, include this License Header -Notice in each file and include the License file at -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the GPL Version 2 section of the License file that -accompanied this code. If applicable, add the following below the -License Header, with the fields enclosed by brackets [] replaced by -your own identifying information: -"Portions Copyrighted [year] [name of copyright owner]" - -If you wish your version of this file to be governed by only the CDDL -or only the GPL Version 2, indicate your decision by adding -"[Contributor] elects to include this software in this distribution -under the [CDDL or GPL Version 2] license." If you do not indicate a -single choice of license, a recipient has the option to distribute -your version of this file under either the CDDL, the GPL Version 2 or -to extend the choice of license to its licensees as provided above. -However, if you add GPL Version 2 code and therefore, elected the GPL -Version 2 license, then the option applies only if the new code is -made subject to such option by the copyright holder. - -Contributor(s): + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. --> " > $DATA ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          775. matthiasblaesing closed pull request #218: [NETBEANS-54] Module Review xml.jaxb URL: https://github.com/apache/incubator-netbeans/pull/218 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          776. geertjanw commented on issue #271: [NETBEANS-54] excluding specific files, e.g., licenses via Rat URL: https://github.com/apache/incubator-netbeans/pull/271#issuecomment-343864526 So, should I simply close this one, is everything handled in #272? ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          777. matthiasblaesing commented on issue #271: [NETBEANS-54] excluding specific files, e.g., licenses via Rat URL: https://github.com/apache/incubator-netbeans/pull/271#issuecomment-343998973 No, #272 makes the exclude you introduced in 2033 obsolete, so that should be removed, The `VERSIONS.txt` excludes can be replaced with a single wildcard exclude as shown above. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          778. matthiasblaesing commented on issue #271: [NETBEANS-54] excluding specific files, e.g., licenses via Rat URL: https://github.com/apache/incubator-netbeans/pull/271#issuecomment-345548468 @geertjanw I extended your work by adding the ALv2 header to all VERSION.txt files. You established this in a prior fix and I think it is a good idea. Please see here: https://github.com/matthiasblaesing/incubator-netbeans/tree/pr271-followup You can full that into your tree as: ``` git pull https://github.com/matthiasblaesing/incubator-netbeans.git pr271-followup ``` ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          779. geertjanw commented on issue #271: [NETBEANS-54] excluding specific files, e.g., licenses via Rat URL: https://github.com/apache/incubator-netbeans/pull/271#issuecomment-346583435 OK, I'll use that to pull this into my tree, but does anything from here need to be pushed to Apache NetBeans Git? Sorry, it's getting too complex for me in this PR, if there's a way you can commit this, that would be great. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          780. asfgit closed pull request #271: [NETBEANS-54] excluding specific files, e.g., licenses via Rat URL: https://github.com/apache/incubator-netbeans/pull/271 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/nbbuild/build.xml b/nbbuild/build.xml index 5a0c39c84..1d7f74287 100644 --- a/nbbuild/build.xml +++ b/nbbuild/build.xml @@ -2032,6 +2032,7 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <exclude name="**/*.mf" /> <!--do not natively support comments--> <exclude name="**/*.MF" /> <!--do not natively support comments--> <exclude name="**/*.nib" /> <!--do not natively support comments--> + <exclude name="**/*.oql" /> <!--do not natively support comments--> <exclude name="**/*.palette_item" /> <!--no degree of creativity--> <exclude name="**/*.pass" /> <!--generated test files--> <exclude name="**/*.pass2" /> <!--generated test files--> @@ -2060,6 +2061,7 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <exclude name="api.search/test/unit/src/org/netbeans/modules/search/data/**" /> <!--test data--> <exclude name="api.templates/test/unit/src/org/netbeans/modules/templates/utf8.xml" /> <!--test data--> <exclude name="apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/license-*.txt" /> <!--template file--> + <exclude name="apisupport.installer/src/org/netbeans/modules/apisupport/installer/resources/licenses/**" /> <!--three license files--> <exclude name="autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/updateprovider/data/**" /> <!-- test data --> <exclude name="beans/src/org/netbeans/modules/beans/resources/templates/*.template" /> <!--license would be visible when users edit the templates inside their IDE--> <exclude name="css.editor/src/org/netbeans/modules/css/resources/CascadeStyleSheet.css.template" /> <!-- user visible template --> @@ -2077,8 +2079,10 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <exclude name="editor.plain/src/org/netbeans/modules/editor/plain/resources/PlainTextExample" /> <!--license would be visible to users in the Fonts/Colors settings--> <exclude name="editor.settings.storage/test/unit/src/org/netbeans/modules/editor/settings/storage/compatibility/p1/**" /> <!--test data--> <exclude name="extbrowser/test/unit/src/org/netbeans/modules/extbrowser/data/mac_defaults_*" /> <!--test data--> + <exclude name="form/src/org/netbeans/modules/form/resources/templates/**" /> <!--template files--> <exclude name="hibernate/src/org/netbeans/modules/hibernate/resources/Hibernate*.xml" /> <!--template files--> <exclude name="hibernate/src/org/netbeans/modules/hibernate/resources/HibernateUtil.javax" /> <!--template file--> + <exclude name="html/test/unit/src/org/netbeans/modules/html/data/**" /> <!--test data--> <exclude name="html.editor/src/org/netbeans/modules/html/editor/options/ui/formatSample.html" /> <!--user visible file template--> <exclude name="html.editor/src/org/netbeans/modules/html/editor/resources/HTMLExample" /> <!--user visible file template--> <exclude name="html.editor/src/org/netbeans/modules/html/editor/resources/XHTMLExample" /> <!--user visible file template--> @@ -2093,6 +2097,7 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <exclude name="java.api.common/src/org/netbeans/modules/java/api/common/project/ui/customizer/vmo/gen/CommandLine.tokens" /> <!--generated by ANTLR--> <exclude name="java.editor/src/org/netbeans/modules/java/editor/resources/JavaExample" /> <!--no degree of creativity--> <exclude name="java.j2semodule/src/org/netbeans/modules/java/j2semodule/ui/resources/module-info.java.template" /> <!--template file--> + <exclude name="java.kit/release/VERSION.txt" /> <!--generated file--> <exclude name="java.platform.ui/src/org/netbeans/modules/java/platform/resources/templates/javaplatform.xml" /> <!--template file--> <exclude name="java.project.ui/src/org/netbeans/modules/java/project/ui/resources/*.template" /> <!-- template files --> <exclude name="java.source/test-excludes.txt" /> <!-- test context --> @@ -2139,6 +2144,7 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <exclude name="options.editor/src/org/netbeans/modules/options/colors/AllLanguagesExample" /> <!--no degree of creativitya--> <exclude name="options.editor/src/org/netbeans/modules/options/colors/HighlightingExample" /> <!--no degree of creativitya--> <exclude name="options.editor/src/org/netbeans/modules/options/indentation/indentationExample" /> <!--no degree of creativitya--> + <exclude name="profiler/release/VERSION.txt" /> <!--generated file--> <exclude name="projectui/src/org/netbeans/modules/project/ui/resources/*-license.txt" /> <!--licenses--> <exclude name="projectui/src/org/netbeans/modules/project/ui/resources/license-default.txt" /> <!--licenses--> <exclude name="projectuiapi/test/unit/src/org/netbeans/modules/project/uiapi/data/*.txt" /> <!--test data--> ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          781. geertjanw commented on issue #271: [NETBEANS-54] excluding specific files, e.g., licenses via Rat URL: https://github.com/apache/incubator-netbeans/pull/271#issuecomment-346706801 Thank you! :-) ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          782. emilianbold opened a new pull request #299: [NETBEANS-54] Module Review usersguide URL: https://github.com/apache/incubator-netbeans/pull/299 Added ASF license footer, replaced the old copyright notice with Apache 2.0. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          783. geertjanw commented on issue #299: [NETBEANS-54] Module Review usersguide URL: https://github.com/apache/incubator-netbeans/pull/299#issuecomment-347483655 Nice, thanks, merging. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          784. geertjanw closed pull request #299: [NETBEANS-54] Module Review usersguide URL: https://github.com/apache/incubator-netbeans/pull/299 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor.htm index c7dad932a..bbca0b026 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor.htm @@ -45,7 +45,7 @@ <h1>Using the CSS Source Editor</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor001.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor001.htm index b742f03a8..9c34fa891 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor001.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor001.htm @@ -211,7 +211,7 @@ <h1>CSS Source Editor</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor002.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor002.htm index 25cb44f9f..e09828516 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor002.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor002.htm @@ -88,7 +88,7 @@ <h1>Add CSS Property Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor003.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor003.htm index 8e6e8bd40..e22b827f3 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor003.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor003.htm @@ -122,7 +122,7 @@ <h1>Edit CSS Rules Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor004.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor004.htm index 97876d8f6..f8ac29ecd 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor004.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor004.htm @@ -164,7 +164,7 @@ <h1>CSS Styles Window</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor005.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor005.htm index c815c051a..8e4c8f5fa 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor005.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor005.htm @@ -116,7 +116,7 @@ <h1>New Sass File</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor006.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor006.htm index 9ce5623f5..f71959bc4 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor006.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_css_editor006.htm @@ -117,7 +117,7 @@ <h1>New LESS File</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs.htm index ab8159e1f..f145139a0 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs.htm @@ -45,7 +45,7 @@ <h1>Using CVS</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs001.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs001.htm index 224af19c9..73434807e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs001.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs001.htm @@ -156,7 +156,7 @@ <h1>CVS Checkout Wizard: CVS Root</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs002.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs002.htm index ca1a56762..e65f2bd1b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs002.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs002.htm @@ -92,7 +92,7 @@ <h1>CVS Checkout Wizard: Module to Checkout</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs003.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs003.htm index 393af8d11..44074d96c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs003.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs003.htm @@ -155,7 +155,7 @@ <h1>CVS Import Wizard: CVS Root</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs004.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs004.htm index 4433e3f47..44e52a3c0 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs004.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs004.htm @@ -101,7 +101,7 @@ <h1>CVS Import Wizard: Folder to Import</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs005.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs005.htm index 01a91ceaf..6cbda0cf2 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs005.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs005.htm @@ -125,7 +125,7 @@ <h1>CVS: Edit CVS Root Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs006.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs006.htm index eb8fbca19..ffecc52c2 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs006.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs006.htm @@ -81,7 +81,7 @@ <h1>CVS: Browse Modules Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs007.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs007.htm index 720cacca3..3d87db335 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs007.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs007.htm @@ -98,7 +98,7 @@ <h1>CVS: Browse Tags Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs008.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs008.htm index 3c8fd8fb9..d253bc27f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs008.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs008.htm @@ -80,7 +80,7 @@ <h1>CVS: Checkout Complete Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs009.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs009.htm index 5275e2a13..2636e8192 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs009.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs009.htm @@ -146,7 +146,7 @@ <h1>CVS: Versioning Window</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs010.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs010.htm index fbe3bbaec..d788126f4 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs010.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs010.htm @@ -246,7 +246,7 @@ <h1>CVS: Diff Viewer</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs011.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs011.htm index e98460856..61b3daaa8 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs011.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs011.htm @@ -185,7 +185,7 @@ <h1>CVS: History Viewer</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs012.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs012.htm index 116a9948f..3ae933aa1 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs012.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs012.htm @@ -91,7 +91,7 @@ <h1>CVS: Merge Conflicts Resolver</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs013.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs013.htm index df53d7652..756e61bc9 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs013.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs013.htm @@ -100,7 +100,7 @@ <h1>CVS: Versioning Options Window</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs014.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs014.htm index dadb19e3d..60cf95696 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs014.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs014.htm @@ -98,7 +98,7 @@ <h1>CVS: Commit Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs015.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs015.htm index e2bf4f829..1e77128a2 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs015.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs015.htm @@ -107,7 +107,7 @@ <h1>CVS: Branch Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs016.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs016.htm index 5f820636f..3fc4e4714 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs016.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs016.htm @@ -86,7 +86,7 @@ <h1>CVS: Switch to Branch Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs017.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs017.htm index 21904ac7a..4eada840b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs017.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs017.htm @@ -114,7 +114,7 @@ <h1>CVS: Merge Changes from Branch Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs018.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs018.htm index 7f128a82b..eb96c4718 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs018.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs018.htm @@ -92,7 +92,7 @@ <h1>CVS: Tag Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs019.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs019.htm index 221c850a9..8c174c035 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs019.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs019.htm @@ -82,7 +82,7 @@ <h1>CVS: Change CVS Root Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs020.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs020.htm index 48b7753c8..6f73bce25 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs020.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_cvs020.htm @@ -86,7 +86,7 @@ <h1>CVS: View Revision Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database.htm index eac62206a..689c8948c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database.htm @@ -45,7 +45,7 @@ <h1>Using Databases</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database001.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database001.htm index 1cd455213..c2e2e2c8d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database001.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database001.htm @@ -115,7 +115,7 @@ <h1>Adding a JDBC Driver: New Connection Wizard and Add Driver</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database002.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database002.htm index a841eb79e..cb43f6218 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database002.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database002.htm @@ -92,7 +92,7 @@ <h1>Connect to Database Dialog</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database003.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database003.htm index 0633015ae..40207957f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database003.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database003.htm @@ -131,7 +131,7 @@ <h1>New Connection Wizard: Customize Connection Dialog</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database004.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database004.htm index 89df8c242..14a0e7eee 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database004.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database004.htm @@ -94,7 +94,7 @@ <h1>Connect to Database Dialog</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database005.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database005.htm index ccbe7e647..5d975f284 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database005.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database005.htm @@ -58,7 +58,7 @@ <h1>New Connection Wizard: Choose Database Schemas</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database006.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database006.htm index a2704c51a..5649f8258 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database006.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database006.htm @@ -174,7 +174,7 @@ <h1>Create Table Dialog</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database007.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database007.htm index c87f10846..36d91e724 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database007.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database007.htm @@ -61,7 +61,7 @@ <h1>SQL History</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database008.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database008.htm index 8391f7d34..7b95a2089 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database008.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database008.htm @@ -150,7 +150,7 @@ <h1>MySQL Server Properties Dialog</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database009.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database009.htm index 66f529c52..217dbe469 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database009.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database009.htm @@ -67,7 +67,7 @@ <h1>New Database Schema Wizard: Database Connection</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database010.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database010.htm index 7c8412b0c..9ab0fc0b2 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database010.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_database010.htm @@ -61,7 +61,7 @@ <h1>New Database Schema Wizard: Tables and Views</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git.htm index 4d2e90058..754a4c4ef 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git.htm @@ -45,7 +45,7 @@ <h1>Using Git</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git001.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git001.htm index e29cb7337..274b2b7b9 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git001.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git001.htm @@ -199,7 +199,7 @@ <h1>Git Clone Repository Wizard: Remote Repository</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git002.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git002.htm index 364254ccf..730c4519a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git002.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git002.htm @@ -154,7 +154,7 @@ <h1>Git: Repository Browser</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git003.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git003.htm index 7a27c703e..f6d9d5008 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git003.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git003.htm @@ -109,7 +109,7 @@ <h1>Git: Initialize a Git Repository Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git004.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git004.htm index 4d2eae234..33dfd58fa 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git004.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git004.htm @@ -78,7 +78,7 @@ <h1>Git Clone Repository Wizard: Remote Branches</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git005.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git005.htm index a66115bf8..da6478342 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git005.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git005.htm @@ -105,7 +105,7 @@ <h1>Git Clone Repository Wizard: Destination Directory</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git006.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git006.htm index ee7dee4e4..5b3a9fb89 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git006.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git006.htm @@ -219,7 +219,7 @@ <h1>Git Fetch from Remote Repository Wizard: Remote Repository</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git007.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git007.htm index cd9d5fbc3..4245f51ae 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git007.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git007.htm @@ -78,7 +78,7 @@ <h1>Git Fetch from Remote Repository Wizard: Remote Branches</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git008.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git008.htm index a3360b392..1ade50a57 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git008.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git008.htm @@ -219,7 +219,7 @@ <h1>Git Pull from Remote Repository Wizard: Remote Repository</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git009.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git009.htm index da5e0b84e..f4984016e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git009.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git009.htm @@ -79,7 +79,7 @@ <h1>Git Pull from Remote Repository Wizard: Remote Branches</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git010.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git010.htm index 2d9e0344b..1473541b5 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git010.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git010.htm @@ -219,7 +219,7 @@ <h1>Git Push to Remote Repository Wizard: Remote Repository</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git011.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git011.htm index daacf8704..993cbb8df 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git011.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git011.htm @@ -78,7 +78,7 @@ <h1>Git Push to Remote Repository Wizard: Select Local Branches</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git012.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git012.htm index 3686a2086..bbfab9f59 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git012.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git012.htm @@ -79,7 +79,7 @@ <h1>Git Push to Remote Repository Wizard: Update Local References</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git013.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git013.htm index 04468a775..5eeaa2006 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git013.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git013.htm @@ -93,7 +93,7 @@ <h1>Git: Checkout Selected Revision Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git014.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git014.htm index dbbc5b48a..ee23b00c6 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git014.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git014.htm @@ -100,7 +100,7 @@ <h1>Git: Create Branch Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git015.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git015.htm index 180f7f6e7..8c6d68581 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git015.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git015.htm @@ -187,7 +187,7 @@ <h1>Git: Commit Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git016.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git016.htm index a187588d8..c9abe331a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git016.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git016.htm @@ -95,7 +95,7 @@ <h1>Git: Select Revision Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git017.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git017.htm index 0ed928902..ed5b97dc1 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git017.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git017.htm @@ -99,7 +99,7 @@ <h1>Git: Checkout Selected Paths Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git018.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git018.htm index 97f4b5ecd..918009e86 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git018.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git018.htm @@ -97,7 +97,7 @@ <h1>Git: Switch To Selected Branch Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git019.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git019.htm index 6b896c297..ae18ffcad 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git019.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git019.htm @@ -93,7 +93,7 @@ <h1>Git: Revert Modifications Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git020.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git020.htm index d105bc9bb..c350268bd 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git020.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git020.htm @@ -103,7 +103,7 @@ <h1>Git: Revert Commit Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git021.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git021.htm index 99818afd6..e9022dc2d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git021.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git021.htm @@ -103,7 +103,7 @@ <h1>Git: Create Tag Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git022.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git022.htm index 96b724fc7..5f07ec90c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git022.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git022.htm @@ -114,7 +114,7 @@ <h1>Git: Manage Tags Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git023.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git023.htm index 5e9e166dc..f4b9a7986 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git023.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git023.htm @@ -93,7 +93,7 @@ <h1>Git: Merge Revision Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git024.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git024.htm index 855152d70..8a86bef8a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git024.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git024.htm @@ -118,7 +118,7 @@ <h1>Git: Versioning View</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git025.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git025.htm index b41ddb542..f7cdf08af 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git025.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git025.htm @@ -124,7 +124,7 @@ <h1>Git: Reset Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git026.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git026.htm index b53a064de..87c18f5b0 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git026.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git026.htm @@ -142,7 +142,7 @@ <h1>Git: Repository Browser</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git027.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git027.htm index b1fb058e9..d5479cc2d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git027.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git027.htm @@ -106,7 +106,7 @@ <h1>Git: Select Template Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git028.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git028.htm index 097ae883c..8f4caf374 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git028.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git028.htm @@ -121,7 +121,7 @@ <h1>Git: Select Commits to Rebase Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git029.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git029.htm index a174bdb1a..63236e72f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git029.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git029.htm @@ -121,7 +121,7 @@ <h1>Git: Select Revisions To Diff Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git030.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git030.htm index 5df46577f..0cfc58fd6 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git030.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git030.htm @@ -152,7 +152,7 @@ <h1>Open Projects Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git031.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git031.htm index 927651408..6e153429e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git031.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git031.htm @@ -99,7 +99,7 @@ <h1>Git: Cherry Pick Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git032.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git032.htm index 1177d67a6..289882a42 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git032.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git032.htm @@ -111,7 +111,7 @@ <h1>Git: Stash Changes Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git033.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git033.htm index 141073c2f..f2657c94e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git033.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_git033.htm @@ -100,7 +100,7 @@ <h1>Git: Shelve Changes Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html.htm index 00bff32dd..30201a805 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html.htm @@ -45,7 +45,7 @@ <h1>HTML5/JavaScript</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html001.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html001.htm index 13e7c7705..f29e3c3d5 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html001.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html001.htm @@ -98,7 +98,7 @@ <h1>Configure JS Test Driver Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html002.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html002.htm index 30bf80ca9..b50335eb4 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html002.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html002.htm @@ -92,7 +92,7 @@ <h1>New HTML5/JS Application Wizard: Name and Location</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html003.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html003.htm index bfdd41bb2..4d3f4d936 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html003.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html003.htm @@ -96,7 +96,7 @@ <h1>New HTML5/JS Application Wizard: Site Template</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html004.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html004.htm index c5ebb16bf..841ddd6cf 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html004.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html004.htm @@ -99,7 +99,7 @@ <h1>New HTML5/JS Application With Existing Sources Wizard: Name and Location</h1 <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html005.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html005.htm index 28fac3b36..123c9f2de 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html005.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html005.htm @@ -92,7 +92,7 @@ <h1>Create Site Template from Current Project Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html006.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html006.htm index 2f8e9f51f..0b060cd3c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html006.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html006.htm @@ -102,7 +102,7 @@ <h1>Project Properties Window: Sources</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html007.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html007.htm index 0d9b09a80..81617b557 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html007.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html007.htm @@ -205,7 +205,7 @@ <h1>Project Properties Window: JavaScript Libraries: npm</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html008.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html008.htm index 04573967e..8cc5d5dfb 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html008.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html008.htm @@ -182,7 +182,7 @@ <h1>Project Properties Window: JavaScript Libraries: Bower</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html009.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html009.htm index 811cdf240..15adb78a1 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html009.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html009.htm @@ -138,7 +138,7 @@ <h1>Project Properties Window: JavaScript Libraries: CDNJS</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html010.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html010.htm index 5fdf2844f..ec64f57d0 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html010.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html010.htm @@ -115,7 +115,7 @@ <h1>Project Properties Window: JavaScript Frameworks: RequireJS</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html011.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html011.htm index 6f811f6a7..fbbb74866 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html011.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html011.htm @@ -117,7 +117,7 @@ <h1>Project Properties Window: Run</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html012.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html012.htm index 16f3405a5..86113124d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html012.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html012.htm @@ -72,7 +72,7 @@ <h1>Project Properties Window: JavaScript: Oracle JET</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html013.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html013.htm index 3000b0aeb..f20874c92 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html013.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html013.htm @@ -133,7 +133,7 @@ <h1>Project Properties Window: Node.js</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html014.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html014.htm index 14d789822..343e1759c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html014.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html014.htm @@ -93,7 +93,7 @@ <h1>HTML5: Customize Window Settings Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html015.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html015.htm index 6c110298c..4cdba445d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html015.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html015.htm @@ -85,7 +85,7 @@ <h1>JavaScript Breakpoint Properties: Line</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html016.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html016.htm index ecd4a1972..76e32fe04 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html016.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html016.htm @@ -105,7 +105,7 @@ <h1>JavaScript Breakpoint Properties: DOM</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html017.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html017.htm index 1eb88462d..79daa48a6 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html017.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html017.htm @@ -86,7 +86,7 @@ <h1>JavaScript Breakpoint Properties: Event</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html018.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html018.htm index b404a6e07..2be144caa 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html018.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html018.htm @@ -79,7 +79,7 @@ <h1>JavaScript Breakpoint Properties: XMLHttpRequest</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html019.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html019.htm index 2abc4c970..1db69586a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html019.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html019.htm @@ -94,7 +94,7 @@ <h1>New HTML5/JS Application Wizard: Mobile Platforms</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html020.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html020.htm index 24cc5d4e7..49b563c7c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html020.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html020.htm @@ -107,7 +107,7 @@ <h1>Project Properties Window: CSS Preprocessors</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html021.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html021.htm index bfb6e398b..f60186f25 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html021.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html021.htm @@ -111,7 +111,7 @@ <h1>Project Properties Window: Cordova</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html022.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html022.htm index 7c02d8e68..91774f342 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html022.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html022.htm @@ -85,7 +85,7 @@ <h1>Project Properties Window: JavaScript</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html023.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html023.htm index 82c1a3678..f57ca3eed 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html023.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html023.htm @@ -101,7 +101,7 @@ <h1>New HTML5/JS Application Wizard: Cordova Support</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html024.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html024.htm index 5fdc17a4f..692f07493 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html024.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html024.htm @@ -126,7 +126,7 @@ <h1>Options Window: HTML/JS: Node.js</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html025.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html025.htm index 6047dbafb..b23cc3e9b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html025.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html025.htm @@ -90,7 +90,7 @@ <h1>Options Window: HTML/JS: Bower</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html026.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html026.htm index 62ff59d07..dd6de410d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html026.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html026.htm @@ -90,7 +90,7 @@ <h1>Options Window: HTML/JS: Grunt</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html027.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html027.htm index a59cac760..1a864a90b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html027.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html027.htm @@ -90,7 +90,7 @@ <h1>Options Window: HTML/JS: Gulp</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html028.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html028.htm index 02816514b..40703565f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html028.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html028.htm @@ -90,7 +90,7 @@ <h1>Options Window: HTML/JS: Karma</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html029.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html029.htm index 5bd7c5d3f..a39db7961 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html029.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html029.htm @@ -87,7 +87,7 @@ <h1>Options Window: Java: Nashorn</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html030.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html030.htm index b5bbd42e2..d7d668559 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html030.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html030.htm @@ -92,7 +92,7 @@ <h1>New HTML5/JS Application with Node.js Wizard: Name and Location</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html031.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html031.htm index de4c3dc88..32259f0d1 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html031.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_html031.htm @@ -86,7 +86,7 @@ <h1>New HTML5/JS Application with Node.js Wizard: Express</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug.htm index d37fba6a5..313873bf9 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug.htm @@ -45,7 +45,7 @@ <h1>Java Debugging</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug001.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug001.htm index 3fd2a9ef6..92ca52188 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug001.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug001.htm @@ -53,7 +53,7 @@ <h1>Debugging: Analyze Stack Window</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug002.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug002.htm index bc696bd88..b55a5ff53 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug002.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug002.htm @@ -180,7 +180,7 @@ <h1>Breakpoint Properties: Class</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug003.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug003.htm index 37a97f21c..ea22cec45 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug003.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug003.htm @@ -177,7 +177,7 @@ <h1>Breakpoint Properties: Exception</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug004.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug004.htm index b95c619fb..49eaac536 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug004.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug004.htm @@ -175,7 +175,7 @@ <h1>Breakpoint Properties: Line</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug005.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug005.htm index 128892d8e..74f12d679 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug005.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug005.htm @@ -184,7 +184,7 @@ <h1>Breakpoint Properties: Method</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug006.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug006.htm index 91a18458f..ee8ea4bbb 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug006.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug006.htm @@ -166,7 +166,7 @@ <h1>Breakpoint Properties: Thread</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug007.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug007.htm index ffa1c5f7a..53171f18c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug007.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug007.htm @@ -187,7 +187,7 @@ <h1>Breakpoint Properties: Field</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug008.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug008.htm index 811e60b0a..f9b4e0835 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug008.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug008.htm @@ -206,7 +206,7 @@ <h1>Breakpoints Window</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug009.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug009.htm index e926e2471..40dab3fd6 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug009.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug009.htm @@ -144,7 +144,7 @@ <h1>Debugging: Call Stack Window</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug010.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug010.htm index 3687b9e25..069d3b102 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug010.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug010.htm @@ -169,7 +169,7 @@ <h1>Debugging: Loaded Classes Window</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug011.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug011.htm index 9ba2bc059..816ea4b2a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug011.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug011.htm @@ -175,7 +175,7 @@ <h1>Options Window: Java: Java Debugger</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug012.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug012.htm index 47bd659b6..c8c3c3287 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug012.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug012.htm @@ -143,7 +143,7 @@ <h1>Debugger Console and Process Output Tabs in the Output Window</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug013.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug013.htm index 97a7bb560..2d7acab34 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug013.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug013.htm @@ -59,7 +59,7 @@ <h1>Debugger Windows</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug014.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug014.htm index 593fec8cb..bc2d9dacb 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug014.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug014.htm @@ -102,7 +102,7 @@ <h1>Debugging: Evaluate Code Window</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug015.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug015.htm index d1e0ef4a0..9d6d6af1a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug015.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug015.htm @@ -51,7 +51,7 @@ <h1>Debugging: Events Window</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug016.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug016.htm index 8b9eee481..454771afd 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug016.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug016.htm @@ -89,7 +89,7 @@ <h1>Old Method on Stack Alert Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug017.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug017.htm index 2d7d345e1..b4cefc950 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug017.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug017.htm @@ -234,7 +234,7 @@ <h1>Debugging: Sessions Window</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug018.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug018.htm index e07455e1b..edfbd98ab 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug018.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug018.htm @@ -99,7 +99,7 @@ <h1>Debugging: Sources Window</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug019.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug019.htm index 419f19a4e..e1d215992 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug019.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug019.htm @@ -242,7 +242,7 @@ <h1>Debugging: Threads Window</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug020.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug020.htm index 5fbfa4dfc..d64d73e59 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug020.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug020.htm @@ -185,7 +185,7 @@ <h1>Debugging: Variables Window</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug021.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug021.htm index d8d9786d7..70268eb52 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug021.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug021.htm @@ -182,7 +182,7 @@ <h1>Debugging: Watches Window</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug022.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug022.htm index a6198415b..de52d715f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug022.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug022.htm @@ -76,7 +76,7 @@ <h1>New Watch Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug023.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug023.htm index ded9db6f5..5062d1d7e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug023.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug023.htm @@ -182,7 +182,7 @@ <h1>Debugging View</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug024.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug024.htm index c63fee3b5..a21ff2814 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug024.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_debug024.htm @@ -130,7 +130,7 @@ <h1>Attach Debugger Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_edit.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_edit.htm index 0ef7d0331..429860b39 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_edit.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_edit.htm @@ -37,7 +37,7 @@ <h1>Using Java Editor</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_edit001.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_edit001.htm index fe145f614..7e774d67e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_edit001.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_edit001.htm @@ -248,7 +248,7 @@ <h1>About the Java Source Editor</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_edit002.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_edit002.htm index 9d3b115d0..ea8341cf5 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_edit002.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_edit002.htm @@ -108,7 +108,7 @@ <h1>Inspect Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee.htm index f964bdae3..96bacb277 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee.htm @@ -45,7 +45,7 @@ <h1>Using Java EE</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee001.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee001.htm index 72ab19ab4..a8cbe5c40 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee001.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee001.htm @@ -112,7 +112,7 @@ <h1>Enterprise Application Client Project Properties Dialog Box: Compiling</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee002.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee002.htm index 40122e83e..5c3869711 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee002.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee002.htm @@ -73,7 +73,7 @@ <h1>Enterprise Application Client Project Properties Dialog Box: Documenting</h1 <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee003.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee003.htm index 4ab60afec..b67165847 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee003.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee003.htm @@ -155,7 +155,7 @@ <h1>Enterprise Application Client Project Properties Dialog Box: Libraries</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee004.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee004.htm index 4db4b7f9f..45e1373ea 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee004.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee004.htm @@ -62,7 +62,7 @@ <h1>Enterprise Application Client Project Properties Dialog Box: Packaging</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee005.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee005.htm index 47d554038..06411635e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee005.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee005.htm @@ -64,7 +64,7 @@ <h1>Enterprise Application Client Project Properties Dialog Box: Run</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee006.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee006.htm index 8b134d842..d1c4532ad 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee006.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee006.htm @@ -144,7 +144,7 @@ <h1>Enterprise Application Client Project Properties Dialog Box: Sources</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee007.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee007.htm index 27f80218b..f2936bcdd 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee007.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee007.htm @@ -144,7 +144,7 @@ <h1>Enterprise Application Client Project Properties Dialog Box: Web Service Cli <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee008.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee008.htm index ffb331245..8091dba27 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee008.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee008.htm @@ -66,7 +66,7 @@ <h1>Enterprise Application Client Project Properties Dialog Box: Disabled Web Se <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee009.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee009.htm index 6b7a7ddc5..9d131d4c7 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee009.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee009.htm @@ -87,7 +87,7 @@ <h1>New Enterprise Application Client with Existing Sources Wizard: Name and Loc <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee010.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee010.htm index 3a2c92bc0..25c4ab27a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee010.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee010.htm @@ -98,7 +98,7 @@ <h1>New Enterprise Application Client with Existing Sources Wizard: Existing Sou <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee011.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee011.htm index 819961b9c..23a10668c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee011.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee011.htm @@ -121,7 +121,7 @@ <h1>New Enterprise Application Client Wizard: Name and Location</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee012.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee012.htm index 46358d187..230787eb3 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee012.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee012.htm @@ -128,7 +128,7 @@ <h1>New Enterprise Application Client Wizard: Server and Settings</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee013.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee013.htm index 161aec77e..ac8447d26 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee013.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee013.htm @@ -95,7 +95,7 @@ <h1>Call Enterprise Bean Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee014.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee014.htm index 73cd72a71..f6b2f298a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee014.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee014.htm @@ -144,7 +144,7 @@ <h1>New Entity Bean Wizard</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee015.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee015.htm index 843f5ccf6..28a1b06b5 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee015.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee015.htm @@ -119,7 +119,7 @@ <h1>New Message-Driven Bean Wizard: Name and Location</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee016.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee016.htm index d960eb169..d62b72691 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee016.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee016.htm @@ -139,7 +139,7 @@ <h1>New Message-Driven Bean Wizard: Activation Config Properties</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee017.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee017.htm index be7e5ad91..cd1c02338 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee017.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee017.htm @@ -108,7 +108,7 @@ <h1>Add Message Destination Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee018.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee018.htm index 61fbfc1a0..bb3f6401e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee018.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee018.htm @@ -143,7 +143,7 @@ <h1>New Session Bean Wizard</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee019.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee019.htm index be62f6b39..e684cfba2 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee019.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee019.htm @@ -127,7 +127,7 @@ <h1>New EJB Module Wizard: Name and Location</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee020.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee020.htm index 73e40ede0..9850f40bb 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee020.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee020.htm @@ -124,7 +124,7 @@ <h1>New EJB Module Wizard: Server and Settings</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee021.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee021.htm index 3d5d5ac74..3e7c1175b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee021.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee021.htm @@ -120,7 +120,7 @@ <h1>New EJB Module with Existing Sources Wizard: Name and Location</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee022.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee022.htm index 3c8554834..d97754d65 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee022.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee022.htm @@ -106,7 +106,7 @@ <h1>New EJB Module with Existing Sources Wizard: Existing Sources and Libraries< <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee023.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee023.htm index 4019e87aa..b8e31ebbf 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee023.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee023.htm @@ -66,7 +66,7 @@ <h1>Add Library Dialog Box (EJB Module)</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee024.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee024.htm index 5b448a3e0..499031860 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee024.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee024.htm @@ -104,7 +104,7 @@ <h1>Standard EJB Module Project Properties Dialog Box: Compiling</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee025.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee025.htm index 691ee20a2..f0b72a53d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee025.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee025.htm @@ -59,7 +59,7 @@ <h1>Standard EJB Module Project Properties Dialog Box: Documenting</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee026.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee026.htm index fc2ed8ccf..7abc01aee 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee026.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee026.htm @@ -150,7 +150,7 @@ <h1>Standard EJB Module Project Properties Dialog Box: Libraries</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee027.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee027.htm index 37323c07c..7fc558a69 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee027.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee027.htm @@ -59,7 +59,7 @@ <h1>Standard EJB Module Project Properties Dialog Box: Packaging</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee028.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee028.htm index 7dd5400b6..c6e2b4a97 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee028.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee028.htm @@ -100,7 +100,7 @@ <h1>Standard EJB Module Project Properties Dialog Box: Run</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee029.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee029.htm index dd08abfc3..d51f4e75b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee029.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee029.htm @@ -161,7 +161,7 @@ <h1>Standard EJB Module Project Properties Dialog Box: Sources</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee030.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee030.htm index 49d592cb5..65ada09fb 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee030.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee030.htm @@ -273,7 +273,7 @@ <h1>Standard EJB Module Project Properties Dialog Box: Web Services</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee031.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee031.htm index adecd87d3..ebbf9ebeb 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee031.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee031.htm @@ -71,7 +71,7 @@ <h1>Standard Enterprise Application Project Properties Dialog Box: Sources</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee032.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee032.htm index df6ed182f..d38690a18 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee032.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee032.htm @@ -71,7 +71,7 @@ <h1>Standard Enterprise Application Project Properties Dialog Box: Compile</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee033.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee033.htm index c27ad99c0..15a17339e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee033.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee033.htm @@ -120,7 +120,7 @@ <h1>Standard Enterprise Application Project Properties Dialog Box: Packaging</h1 <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee034.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee034.htm index a04e86af5..80e8d0182 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee034.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee034.htm @@ -108,7 +108,7 @@ <h1>Standard Enterprise Application Project Properties Dialog Box: Libraries</h1 <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee035.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee035.htm index 18fbb0755..75f09f545 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee035.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee035.htm @@ -96,7 +96,7 @@ <h1>Standard Enterprise Application Project Properties Dialog Box: Run</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee036.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee036.htm index 52ea2a9cd..b2b8cab72 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee036.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee036.htm @@ -107,7 +107,7 @@ <h1>New Enterprise Application with Existing Sources: Name and Location</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee037.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee037.htm index 709e201bb..d467b928a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee037.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee037.htm @@ -138,7 +138,7 @@ <h1>New Enterprise Application Wizard with Existing Sources: Server and Settings <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee038.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee038.htm index 2ff33559d..ca59dd7da 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee038.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee038.htm @@ -69,7 +69,7 @@ <h1>New Enterprise Application with Existing Sources: Application Modules</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee039.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee039.htm index 729be4281..6e97253d7 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee039.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee039.htm @@ -109,7 +109,7 @@ <h1>New Enterprise Application Wizard: Name and Location</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee040.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee040.htm index 751ec1e52..0a2af051f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee040.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee040.htm @@ -126,7 +126,7 @@ <h1>New Enterprise Application Wizard: Server and Settings</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee041.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee041.htm index 530e9796a..66e2c88e2 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee041.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee041.htm @@ -90,7 +90,7 @@ <h1>Specify Mail Resource Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee042.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee042.htm index 8d6ab823f..64541f24c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee042.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee042.htm @@ -118,7 +118,7 @@ <h1>Send JMS Message Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee043.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee043.htm index 85d12674e..52bada1c3 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee043.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee043.htm @@ -109,7 +109,7 @@ <h1>Choose Database Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee044.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee044.htm index dd8172d4c..3d4798ef5 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee044.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee044.htm @@ -81,7 +81,7 @@ <h1>Create Data Source Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee045.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee045.htm index 791729e99..da8ffb471 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee045.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee045.htm @@ -51,7 +51,7 @@ <h1>Resolve Data Sources Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee046.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee046.htm index 9e9c1ad1e..07259e48f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee046.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee046.htm @@ -54,7 +54,7 @@ <h1>New Session Beans for Entity Classes: Entity Classes</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee047.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee047.htm index 59461fc25..1e20331c9 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee047.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee047.htm @@ -88,7 +88,7 @@ <h1>New Session Beans for Entity Classes: Generated Session Beans</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee048.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee048.htm index 4feab2010..77455f68c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee048.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee048.htm @@ -74,7 +74,7 @@ <h1>Registering an Oracle WebLogic Server</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee049.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee049.htm index 62bd5194f..6df83392c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee049.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee049.htm @@ -94,7 +94,7 @@ <h1>Add Server Instance Wizard: Oracle WebLogic Server Instance Location</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee050.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee050.htm index f9f4e9e4e..52169b98d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee050.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee050.htm @@ -105,7 +105,7 @@ <h1>Add Server Instance Wizard: Oracle WebLogic Server Instance Properties</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee051.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee051.htm index 69e1ebd43..b1f790451 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee051.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee051.htm @@ -100,7 +100,7 @@ <h1>Add Server Instance Wizard: Oracle WebLogic Server Instance Properties</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee052.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee052.htm index ec989d71d..e5da16bcc 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee052.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee052.htm @@ -87,7 +87,7 @@ <h1>Visual Editor: Add Group</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee053.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee053.htm index 8899c7693..be7b16955 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee053.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee053.htm @@ -100,7 +100,7 @@ <h1>Visual Editor: Add Principal</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee054.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee054.htm index eaca34557..5fd1b5117 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee054.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee054.htm @@ -96,7 +96,7 @@ <h1>Visual Editor: Edit Group</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee055.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee055.htm index 0aa77cf2e..478be7ef0 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee055.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee055.htm @@ -102,7 +102,7 @@ <h1>Visual Editor: Edit Principal</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee056.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee056.htm index 10a61dcc4..d07bf3247 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee056.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee056.htm @@ -110,7 +110,7 @@ <h1>Visual Editor: Message Security</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee057.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee057.htm index 0403cd3b7..37660851f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee057.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee057.htm @@ -74,7 +74,7 @@ <h1>Visual Editor: Message Security Bindings</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee058.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee058.htm index 8723608e4..f7c579f48 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee058.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee058.htm @@ -121,7 +121,7 @@ <h1>Deployment Descriptor Visual Editor: Security</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee059.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee059.htm index 0d11d2e39..41702ab31 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee059.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee059.htm @@ -108,7 +108,7 @@ <h1>Deployment Descriptor Visual Editor: Servlets</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee060.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee060.htm index faee4a51f..ee46cb669 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee060.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee060.htm @@ -156,7 +156,7 @@ <h1>glassfish-web.xml Visual Editor: General</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee061.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee061.htm index b310c5dda..97c0140da 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee061.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee061.htm @@ -117,7 +117,7 @@ <h1>Deployment Descriptor Visual Editor: Messaging</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee062.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee062.htm index bb6ddb0b5..2e413336d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee062.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee062.htm @@ -131,7 +131,7 @@ <h1>Deployment Descriptor Visual Editor: Web Service Clients</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee063.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee063.htm index 2fa643953..e2ca2bf0a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee063.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee063.htm @@ -294,7 +294,7 @@ <h1>Deployment Descriptor Visual Editor: Web Services</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee064.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee064.htm index 2da07b31a..5b419beb1 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee064.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee064.htm @@ -111,7 +111,7 @@ <h1>glassfish-application-client.xml Visual Editor: General</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee065.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee065.htm index 5503accb5..655ed5155 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee065.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee065.htm @@ -172,7 +172,7 @@ <h1>Deployment Descriptor Visual Editor: Environment</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee066.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee066.htm index ddf740341..912fc1875 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee066.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee066.htm @@ -292,7 +292,7 @@ <h1>Deployment Descriptor Visual Editor: EJB</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee067.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee067.htm index ce0bc982b..88bf9bb1d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee067.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee067.htm @@ -147,7 +147,7 @@ <h1>glassfish-ejb-jar.xml Visual Editor: General</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee068.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee068.htm index 5644eb34d..de680755b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee068.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee068.htm @@ -125,7 +125,7 @@ <h1>New JDBC Connection Pool: Choose Database Connection</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee069.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee069.htm index 12e928781..dafd8e463 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee069.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee069.htm @@ -111,7 +111,7 @@ <h1>New JDBC Connection Pool: Add Connection Pool Properties</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee070.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee070.htm index 58261b847..51b1fd777 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee070.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee070.htm @@ -201,7 +201,7 @@ <h1>New JDBC Connection Pool: Add Connection Pool Optional Settings</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee071.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee071.htm index 6c49b26ed..520331bc7 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee071.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee071.htm @@ -122,7 +122,7 @@ <h1>New JDBC Resource: General Attributes</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee072.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee072.htm index 33379fc15..2f9bcf926 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee072.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee072.htm @@ -86,7 +86,7 @@ <h1>New JDBC Resource: Additional Properties</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee073.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee073.htm index d0f48c035..7a42fee99 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee073.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee073.htm @@ -120,7 +120,7 @@ <h1>JMS Resource General Attributes</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee074.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee074.htm index 2479e73c0..cb9f22bfb 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee074.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee074.htm @@ -52,7 +52,7 @@ <h1>JMS Resource Properties</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee075.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee075.htm index ad83089f8..64e68d6a3 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee075.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee075.htm @@ -105,7 +105,7 @@ <h1>JavaMail Session: General Attributes</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee076.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee076.htm index 39978ff39..973066df4 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee076.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee076.htm @@ -67,7 +67,7 @@ <h1>JavaMail Session Properties</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee077.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee077.htm index 46918a1de..3ce9d3417 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee077.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee077.htm @@ -54,7 +54,7 @@ <h1>Add Server Instance Wizard: Domain Folder Location</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee078.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee078.htm index bf61c885d..0ce505646 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee078.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee078.htm @@ -80,7 +80,7 @@ <h1>Add Server Instance Wizard: Domain Admin Port Info</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee079.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee079.htm index 0f67402b7..b830efb5b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee079.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee079.htm @@ -81,7 +81,7 @@ <h1>Add Server Instance Wizard: Domain Admin Login Info</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee080.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee080.htm index 8900d7ae7..8ee8ffd76 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee080.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee080.htm @@ -125,7 +125,7 @@ <h1>Add Server Instance Wizard: Server Location</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee081.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee081.htm index f8b6c8e0e..fe3f221eb 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee081.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee081.htm @@ -61,7 +61,7 @@ <h1>Add Server Wizard: Creation Properties</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee082.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee082.htm index 18ae0bc8d..b464675c1 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee082.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee082.htm @@ -77,7 +77,7 @@ <h1>Add Server Instance Wizard: GlassFish Server Location</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee083.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee083.htm index aa3561e0e..262535320 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee083.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee083.htm @@ -107,7 +107,7 @@ <h1>Add Server Instance Wizard: GlassFish Domain Name/Location</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee084.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee084.htm index 29cb34699..ea766d1fd 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee084.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee084.htm @@ -328,7 +328,7 @@ <h1>Servers Manager</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee085.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee085.htm index f5efef316..74eaec42e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee085.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee085.htm @@ -104,7 +104,7 @@ <h1>Add Server Instance Wizard: Tomcat Installation and Login Details</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee086.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee086.htm index ddf9e8b80..7aa908b96 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee086.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee086.htm @@ -109,7 +109,7 @@ <h1>New Web Service from WSDL Wizard: Name and Location</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee087.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee087.htm index c2ebe90f8..de28ab28f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee087.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee087.htm @@ -102,7 +102,7 @@ <h1>New Web Service Wizard: Name and Location</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee088.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee088.htm index bf1db924f..26d83dc3d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee088.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee088.htm @@ -104,7 +104,7 @@ <h1>New Web Service Client Wizard: WSDL and Client Location</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee089.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee089.htm index bcbf860e3..65b8cdf8c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee089.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee089.htm @@ -87,7 +87,7 @@ <h1>New Message Handler Wizard: Specify SOAP Message Handler Class Information</ <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee090.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee090.htm index b9ec2a6c9..0b8d3a1e8 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee090.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee090.htm @@ -87,7 +87,7 @@ <h1>New Logical Handler Wizard: Specify Logical Message Handler Class Informatio <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee091.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee091.htm index de7840a3f..e3cbcc830 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee091.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee091.htm @@ -88,7 +88,7 @@ <h1>Web Service Attributes Editor</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee092.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee092.htm index 4a9eda88a..2be53d661 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee092.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee092.htm @@ -147,7 +147,7 @@ <h1>Web Service Attributes Editor: Quality of Service: Port Binding</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee093.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee093.htm index 43782ae63..2e3324ff4 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee093.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee093.htm @@ -87,7 +87,7 @@ <h1>Web Service Attributes Editor: Quality of Service: Operations</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee094.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee094.htm index 4e2127903..863608adc 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee094.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee094.htm @@ -87,7 +87,7 @@ <h1>Web Service Attributes Editor: Quality of Service: Operation</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee095.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee095.htm index 32e3bfe43..1f7062a4c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee095.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee095.htm @@ -87,7 +87,7 @@ <h1>Web Service Attributes Editor: Quality of Service: Input Message</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee096.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee096.htm index 65dd32095..442d98295 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee096.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee096.htm @@ -87,7 +87,7 @@ <h1>Web Service Attributes Editor: Quality of Service: Output Message</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee097.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee097.htm index 21f16e887..7f6e8e533 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee097.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee097.htm @@ -78,7 +78,7 @@ <h1>Web Service Attributes Editor: Quality of Service: Add Header</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee098.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee098.htm index cd8062e19..61d67f65b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee098.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee098.htm @@ -86,7 +86,7 @@ <h1>Web Service Attributes Editor: Quality of Service: Transport</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee099.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee099.htm index e87ded6c4..71887512d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee099.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee099.htm @@ -110,7 +110,7 @@ <h1>Web Service Attributes Editor: Quality of Service: Security</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee100.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee100.htm index 0827733eb..d22676514 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee100.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee100.htm @@ -87,7 +87,7 @@ <h1>Web Service Attributes Editor: Quality of Service: Advanced Configuration</h <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee101.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee101.htm index 7ba030cb4..db4452a79 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee101.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee101.htm @@ -99,7 +99,7 @@ <h1>Web Service Attributes Editor: WSDL Customization: Global Customization</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee102.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee102.htm index bae390103..fe6b34842 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee102.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee102.htm @@ -99,7 +99,7 @@ <h1>Web Service Attributes Editor: WSDL Customization: Port Types</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee103.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee103.htm index 39e79af9b..4ebc0f12c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee103.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee103.htm @@ -58,7 +58,7 @@ <h1>Web Service Attributes Editor: WSDL Customization: Port Type Faults</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee104.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee104.htm index 7b06533e0..602e5d48d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee104.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee104.htm @@ -76,7 +76,7 @@ <h1>Web Service Attributes Editor: WSDL Customization: Bindings</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee105.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee105.htm index a9293b2ef..a0899f5e0 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee105.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee105.htm @@ -77,7 +77,7 @@ <h1>Web Service Attributes Editor: WSDL Customization: Binding Operations</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee106.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee106.htm index 319ae2a90..851461bcb 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee106.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee106.htm @@ -77,7 +77,7 @@ <h1>Web Service Attributes Editor: WSDL Customization: Services</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee107.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee107.htm index 647b583ac..c0759edd5 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee107.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee107.htm @@ -76,7 +76,7 @@ <h1>Web Service Attributes Editor: WSDL Customization: Ports</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee108.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee108.htm index 5389bd117..3b69a979e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee108.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee108.htm @@ -83,7 +83,7 @@ <h1>Web Service Attributes Editor: WSDL Customization: External Binding Files</h <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee109.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee109.htm index 9508c16e3..a3332e862 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee109.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee109.htm @@ -109,7 +109,7 @@ <h1>RESTful Web Services from Patterns Wizard: Specify Resource Classes (Simple <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee110.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee110.htm index cc817d97d..f83080558 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee110.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee110.htm @@ -133,7 +133,7 @@ <h1>RESTful Web Services from Patterns Wizard: Specify Resource Classes (Contain <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee111.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee111.htm index 837576c3f..229233ccb 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee111.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee111.htm @@ -133,7 +133,7 @@ <h1>RESTful Web Services from Patterns Wizard: Specify Resource Classes (Client <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee112.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee112.htm index e8c73bb98..51fd18dca 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee112.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee112.htm @@ -111,7 +111,7 @@ <h1>New RESTful JavaScript Client Wizard: Configure JavaScript REST Client</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee113.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee113.htm index 55877d583..45f0476e2 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee113.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee113.htm @@ -53,7 +53,7 @@ <h1>Add Server Instance Wizard: JBoss Server Instance Properties</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee114.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee114.htm index a08257ab4..f7b4c5fcc 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee114.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_ee114.htm @@ -52,7 +52,7 @@ <h1>Add Server Instance Wizard: JBoss Server Instance Location</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui.htm index 53ec214d6..44b275d8a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui.htm @@ -37,7 +37,7 @@ <h1>Java GUI</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui001.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui001.htm index 5a6fb517d..03983e1d7 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui001.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui001.htm @@ -74,7 +74,7 @@ <h1>Advanced Modify Source Dialog</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui002.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui002.htm index 2f2ed49fc..c8eea439b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui002.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui002.htm @@ -150,7 +150,7 @@ <h1>Bind Dialog Box: Advanced Tab</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui003.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui003.htm index 5142123ed..e4b34754d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui003.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui003.htm @@ -188,7 +188,7 @@ <h1>Bind Dialog Box: Binding Tab</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui004.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui004.htm index 001c7a528..66d4d5e20 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui004.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui004.htm @@ -94,7 +94,7 @@ <h1>GUI Builder Connection Wizard: Select Source Event</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui005.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui005.htm index 811bcc212..e1d2a04be 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui005.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui005.htm @@ -116,7 +116,7 @@ <h1>GUI Builder Connection Wizard: Specify Target Operation</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui006.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui006.htm index 8427cca33..95b7cb727 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui006.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui006.htm @@ -104,7 +104,7 @@ <h1>GUI Builder Connection Wizard: Enter Parameters</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui007.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui007.htm index f2b43a805..fb5ded510 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui007.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui007.htm @@ -61,7 +61,7 @@ <h1>Customize Code Dialog Box (Swing GUI Builder)</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui008.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui008.htm index 2b6f1e56a..bcf7b2c14 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui008.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui008.htm @@ -82,7 +82,7 @@ <h1>Event Handler Dialog</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui009.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui009.htm index 933e37310..3c41a54c4 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui009.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui009.htm @@ -124,7 +124,7 @@ <h1>GUI Builder: GridBag Customizer</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui010.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui010.htm index 4e27e858b..29083de06 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui010.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui010.htm @@ -57,7 +57,7 @@ <h1>GUI Builder</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui011.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui011.htm index 5bde07a95..121fbace5 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui011.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui011.htm @@ -159,7 +159,7 @@ <h1>Variables Modifier Property Editor</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui012.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui012.htm index c274814ac..a57886731 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui012.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui012.htm @@ -82,7 +82,7 @@ <h1>Palette Window</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui013.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui013.htm index ab574d5bd..43c815327 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui013.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui013.htm @@ -58,7 +58,7 @@ <h1>GUI Builder: Preview Window</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui014.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui014.htm index cb08bdbc6..d15449449 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui014.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui014.htm @@ -85,7 +85,7 @@ <h1>GUI Builder: Property Editors</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui015.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui015.htm index c1da7f4de..c3e6b8d17 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui015.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui015.htm @@ -111,7 +111,7 @@ <h1>New Master/Detail Form Wizard: Detail Option</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui016.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui016.htm index cb48152e8..1a95575ef 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui016.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui016.htm @@ -111,7 +111,7 @@ <h1>New Master/Detail Form Wizard: Master Table</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui017.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui017.htm index 1806eac43..6fd775934 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui017.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui017.htm @@ -147,7 +147,7 @@ <h1>New JavaFX Application</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui018.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui018.htm index 7253cc680..1f5991c30 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui018.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui018.htm @@ -139,7 +139,7 @@ <h1>New JavaFX Application (FXML)</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui019.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui019.htm index eead188d3..93d91db4d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui019.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui019.htm @@ -124,7 +124,7 @@ <h1>New JavaFX Preloader</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui020.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui020.htm index 63ddc9c47..efabbba7c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui020.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui020.htm @@ -124,7 +124,7 @@ <h1>New JavaFX in Swing Application</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui021.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui021.htm index 0f70dd999..7b43a58a6 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui021.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui021.htm @@ -133,7 +133,7 @@ <h1>Java FX Project Properties: Deployment</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui022.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui022.htm index b8353a347..aa5a2e5d3 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui022.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_gui022.htm @@ -190,7 +190,7 @@ <h1>Java FX Project Properties: Run</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me.htm index bb2739e31..e071abd70 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me.htm @@ -37,7 +37,7 @@ <h1>Using Java ME</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me001.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me001.htm index 96e00f65c..073ceda6e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me001.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me001.htm @@ -112,7 +112,7 @@ <h1>Add/Edit Attribute</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me002.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me002.htm index a38daec06..ceb512a65 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me002.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me002.htm @@ -114,7 +114,7 @@ <h1>Add Keystore</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me003.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me003.htm index 2f73bf2a6..df827f7a8 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me003.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me003.htm @@ -98,7 +98,7 @@ <h1>Add Libraries</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me004.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me004.htm index f71c9c1f9..7113b8ade 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me004.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me004.htm @@ -96,7 +96,7 @@ <h1>Add/Edit MIDlet</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me005.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me005.htm index d03d2a402..85e6dcd5e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me005.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me005.htm @@ -93,7 +93,7 @@ <h1>Add/Edit Push Registry Entry</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me006.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me006.htm index 0d7b69fca..52a583450 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me006.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me006.htm @@ -136,7 +136,7 @@ <h1>Create Key Pair</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me007.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me007.htm index dae37db51..fedafb666 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me007.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me007.htm @@ -84,7 +84,7 @@ <h1>Enter Password</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me008.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me008.htm index 28cdac975..474009dd0 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me008.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me008.htm @@ -124,7 +124,7 @@ <h1>Export Key</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me009.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me009.htm index b36c7b295..f0e886a74 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me009.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me009.htm @@ -136,7 +136,7 @@ <h1>Keystores Manager</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me010.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me010.htm index 054aef94e..212473bea 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me010.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me010.htm @@ -120,7 +120,7 @@ <h1>Java ME Project Node</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me011.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me011.htm index b494c66e7..e890ae7ea 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me011.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me011.htm @@ -105,7 +105,7 @@ <h1>Add Java Platform Wizard: Select Platform Type</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me012.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me012.htm index 017bc6773..508806d95 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me012.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me012.htm @@ -84,7 +84,7 @@ <h1>Add Java Platform Wizard: Platform Folders Page</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me013.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me013.htm index f9a89f6fd..99bac7fe4 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me013.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me013.htm @@ -98,7 +98,7 @@ <h1>Add Java Platform Wizard: Detected Platforms Page</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me014.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me014.htm index 9d2d1449d..3c31daf90 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me014.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me014.htm @@ -109,7 +109,7 @@ <h1>Add Java Platform Wizard: General Information Page</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me015.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me015.htm index 509640b62..e509b67b4 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me015.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me015.htm @@ -86,7 +86,7 @@ <h1>Add Java Platform Wizard: Bootstrap Libraries Page</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me016.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me016.htm index 55ef96a11..2c2c15348 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me016.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me016.htm @@ -88,7 +88,7 @@ <h1>Add Java Platform wizard: Sources and Javadoc Page</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me017.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me017.htm index cd03b8549..f4ed08c06 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me017.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me017.htm @@ -115,7 +115,7 @@ <h1>New Embedded Application Wizard: Project Name and Location Page</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me018.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me018.htm index bf7a9c53c..0f67e1205 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me018.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me018.htm @@ -113,7 +113,7 @@ <h1>New Embedded Application Wizard: Default Platform Selection Page</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me019.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me019.htm index 121aa0a80..75013b753 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me019.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me019.htm @@ -97,7 +97,7 @@ <h1>New Embedded Application Wizard: More Configurations Selection Page</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me020.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me020.htm index 58000a6f6..c1351eade 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me020.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me020.htm @@ -129,7 +129,7 @@ <h1>New MIDP File Wizard: Name and Location Page</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me021.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me021.htm index 8b4ad608c..0269e718e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me021.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me021.htm @@ -145,7 +145,7 @@ <h1>New Java ME Embedded Application Wizard: Name and Location</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me022.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me022.htm index 08917184e..5cd3434f9 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me022.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me022.htm @@ -112,7 +112,7 @@ <h1>Java ME Embedded Project Properties Dialog Box: Sources</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me023.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me023.htm index 998f94f86..4179f06c9 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me023.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me023.htm @@ -127,7 +127,7 @@ <h1>Java ME Embedded Project Properties Dialog Box: Platform</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me024.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me024.htm index 584552105..eb4569fc8 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me024.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me024.htm @@ -131,7 +131,7 @@ <h1>Java ME Embedded Project Properties Dialog Box: Libraries</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me025.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me025.htm index 1bf1f9d19..3445ea345 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me025.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me025.htm @@ -271,7 +271,7 @@ <h1>Java ME Embedded Project Properties Dialog Box: Application Descriptor</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me026.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me026.htm index ea1565222..09b53120c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me026.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me026.htm @@ -149,7 +149,7 @@ <h1>Java ME Embedded Project Properties Dialog Box: Compiling</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me027.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me027.htm index 938dc797f..f93ebbfd1 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me027.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me027.htm @@ -103,7 +103,7 @@ <h1>Java ME Embedded Project Properties Dialog Box: Signing</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me028.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me028.htm index 056fa4105..c09d85968 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me028.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me028.htm @@ -91,7 +91,7 @@ <h1>Java ME Embedded Project Properties Dialog Box: Obfuscating</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me029.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me029.htm index a8f7844b7..d888cfa65 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me029.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me029.htm @@ -132,7 +132,7 @@ <h1>Java ME Embedded Project Properties Dialog Box: Documenting</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me030.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me030.htm index 5cea21b4e..e2d1d4b52 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me030.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me030.htm @@ -95,7 +95,7 @@ <h1>Java ME Embedded Project Properties Dialog Box: Run</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me031.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me031.htm index f38e807d5..478d7bb63 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me031.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_me031.htm @@ -91,7 +91,7 @@ <h1>Add/Edit Permission for API</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project.htm index 47bb124b4..74975f415 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project.htm @@ -37,7 +37,7 @@ <h1>Java Projects</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project001.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project001.htm index 49dbdbb1b..c36465337 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project001.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project001.htm @@ -112,7 +112,7 @@ <h1>Add Java Platform Wizard: Choose Platform Folder</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project002.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project002.htm index 30890d610..84811658f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project002.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project002.htm @@ -108,7 +108,7 @@ <h1>Add Java Platform Wizard: Platform Name</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project003.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project003.htm index c4ccaef19..4722fa97b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project003.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project003.htm @@ -100,7 +100,7 @@ <h1>New Java Project with Existing Sources Wizard: Name and Location</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project004.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project004.htm index 8a56c6143..28056b16d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project004.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project004.htm @@ -95,7 +95,7 @@ <h1>New Java Project with Existing Sources Wizard: Existing Sources</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project005.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project005.htm index e04ade732..e9708afaa 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project005.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project005.htm @@ -94,7 +94,7 @@ <h1>New Java Project with Existing Sources Wizard: Includes &amp; Excludes</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project006.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project006.htm index 3eef762d1..4ced0e6c7 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project006.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project006.htm @@ -66,7 +66,7 @@ <h1>Free-Form Project Properties Dialog Box: Build and Run</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project007.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project007.htm index a598a5c8e..9e1cf428c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project007.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project007.htm @@ -121,7 +121,7 @@ <h1>Free-Form Project Properties Dialog Box: Java Sources Classpath</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project008.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project008.htm index d64ee87e1..ecaddd93b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project008.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project008.htm @@ -129,7 +129,7 @@ <h1>Free-Form Project Properties Dialog Box: Output</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project009.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project009.htm index 63299eaf3..84fc59868 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project009.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project009.htm @@ -144,7 +144,7 @@ <h1>Free-Form Project Properties Dialog Box: Java Sources</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project010.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project010.htm index 3baaeeaba..dcbaf882e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project010.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project010.htm @@ -112,7 +112,7 @@ <h1>New Free-form Project Wizard: Name and Location</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project011.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project011.htm index 31a3fe5eb..c4a592237 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project011.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project011.htm @@ -66,7 +66,7 @@ <h1>New Free-Form Project Wizard: Build and Run Actions</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project012.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project012.htm index 9117b544a..fc56b0da7 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project012.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project012.htm @@ -157,7 +157,7 @@ <h1>New Free-Form Project Wizard: Source Package Folders</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project013.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project013.htm index 32cfb4c1f..7695cb465 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project013.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project013.htm @@ -122,7 +122,7 @@ <h1>New Free-Form Project Wizard: Java Sources Classpath</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project014.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project014.htm index 125f8dafe..de74cd87c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project014.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project014.htm @@ -115,7 +115,7 @@ <h1>New Free-Form Project Wizard: Project Output</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project015.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project015.htm index 08ac01863..9a2fd381e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project015.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project015.htm @@ -102,7 +102,7 @@ <h1>Standard Java SE Project Properties Dialog Box: Application</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project016.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project016.htm index 305715958..fd29ef1bf 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project016.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project016.htm @@ -156,7 +156,7 @@ <h1>Standard Java SE Project Properties Dialog Box: Compiling</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project017.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project017.htm index 96f2aa5e6..f24e1ab50 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project017.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project017.htm @@ -129,7 +129,7 @@ <h1>Standard Java SE Project Properties Dialog Box: Documenting</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project018.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project018.htm index db30286c2..4f7b48f1e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project018.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project018.htm @@ -175,7 +175,7 @@ <h1>Standard Java SE Project Properties Dialog Box: Libraries</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project019.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project019.htm index 7acf3cd42..c1bdeae7d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project019.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project019.htm @@ -136,7 +136,7 @@ <h1>Standard Java SE Project Properties Dialog Box: Packaging</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project020.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project020.htm index 08e44b0c9..3b725bb26 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project020.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project020.htm @@ -155,7 +155,7 @@ <h1>Standard Java SE Project Properties Dialog Box: Run</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project021.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project021.htm index 97c785287..dd8eb3d82 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project021.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project021.htm @@ -164,7 +164,7 @@ <h1>Standard Java SE Project Properties Dialog Box: Sources</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project022.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project022.htm index db2d6fa98..b8c96e7ea 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project022.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project022.htm @@ -100,7 +100,7 @@ <h1>Standard Java SE Project Properties Dialog Box: Deployment</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project023.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project023.htm index c1f668521..9d67361d8 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project023.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project023.htm @@ -202,7 +202,7 @@ <h1>Standard Java SE Project Properties Dialog Box: Web Start</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project024.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project024.htm index dd09c1ae8..33c7e11d2 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project024.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project024.htm @@ -187,7 +187,7 @@ <h1>Standard Java SE Project Properties Dialog Box: Web Service Clients</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project025.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project025.htm index 0ce89a797..0988537c8 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project025.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project025.htm @@ -81,7 +81,7 @@ <h1>Standard Java SE Project Properties Dialog Box: Disabled Web Service Clients <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project026.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project026.htm index d2469dff1..9fc005adc 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project026.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project026.htm @@ -131,7 +131,7 @@ <h1>New Java Application Wizard: Name and Location</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project027.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project027.htm index 0c314db51..88a6d9d87 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project027.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project027.htm @@ -109,7 +109,7 @@ <h1>New Java Class Library Wizard: Name and Location</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project028.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project028.htm index 8b1c2ccb4..6c7f8e23f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project028.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project028.htm @@ -66,7 +66,7 @@ <h1>New Libraries Wizard: Library Folder</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project029.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project029.htm index f9568edb7..d6a20cc1a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project029.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project029.htm @@ -111,7 +111,7 @@ <h1>New Libraries Wizard: Actions</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project030.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project030.htm index 9124c54d6..2c66fdf80 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project030.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project030.htm @@ -86,7 +86,7 @@ <h1>Java Platform Manager Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project031.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project031.htm index fd63a1dfb..eebb19575 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project031.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project031.htm @@ -101,7 +101,7 @@ <h1>Configure Include and Excludes Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project032.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project032.htm index c51e0ca88..402906f3e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project032.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project032.htm @@ -138,7 +138,7 @@ <h1>Options Window: Java: Ant</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project033.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project033.htm index bcae817f0..8cf43a74b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project033.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project033.htm @@ -150,7 +150,7 @@ <h1>Add Java Platform Wizard: Set Up Remote Platform</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project034.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project034.htm index bae0037be..65a9ebefe 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project034.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_java_project034.htm @@ -110,7 +110,7 @@ <h1>Create Java SE Embedded JRE</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa.htm index 6d4f5b360..20d2d0d62 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa.htm @@ -45,7 +45,7 @@ <h1>Using JPA</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa001.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa001.htm index 8f65d644e..1be5beb73 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa001.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa001.htm @@ -62,7 +62,7 @@ <h1>JPQL Query Editor</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa002.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa002.htm index 4d97732bf..0a3f51137 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa002.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa002.htm @@ -98,7 +98,7 @@ <h1>New Entity Class Wizard</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa003.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa003.htm index 95fff20b6..2838fac7b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa003.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa003.htm @@ -81,7 +81,7 @@ <h1>New Entity Classes from Database Wizard: Database Tables</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa004.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa004.htm index 3735945e2..f09e078d8 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa004.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa004.htm @@ -129,7 +129,7 @@ <h1>New Entity Classes from Database Wizard: Entity Classes</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa005.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa005.htm index c9eb9e338..73c36d034 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa005.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa005.htm @@ -124,7 +124,7 @@ <h1>New Entity Classes from Database Wizard: Mapping Options</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa006.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa006.htm index ba0f23e31..5c6301cb8 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa006.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa006.htm @@ -58,7 +58,7 @@ <h1>Add Entity Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa007.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa007.htm index 2a5797032..50b69adc8 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa007.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa007.htm @@ -74,7 +74,7 @@ <h1>New JPA Controller Classes from Entity Class Wizard: Entity Classes</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa008.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa008.htm index a4c2148e2..2e2b2902a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa008.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa008.htm @@ -91,7 +91,7 @@ <h1>New JPA Controller Classes from Entity Class Wizard: Generate JPA Controller <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa009.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa009.htm index 0654dd0a2..57ae08a9a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa009.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa009.htm @@ -170,7 +170,7 @@ <h1>persistence.xml Visual Editor</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa010.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa010.htm index 628182c0b..53c829ea3 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa010.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa010.htm @@ -113,7 +113,7 @@ <h1>New Persistence Unit Wizard: Provider and Database</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa011.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa011.htm index b01dd8de3..eab1c104d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa011.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa011.htm @@ -59,7 +59,7 @@ <h1>Hibernate Reverse Engineering Wizard: Database Tables</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa012.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa012.htm index 854d778ca..bcac4c512 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa012.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa012.htm @@ -150,7 +150,7 @@ <h1>Hibernate Mapping Files and POJOs Wizard: Generation of Code</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa013.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa013.htm index c2c3bba42..c80af9969 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa013.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa013.htm @@ -104,7 +104,7 @@ <h1>Hibernate Mapping Wizard: Select Mapping Class</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa014.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa014.htm index a09dc7dc6..4af78d0e0 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa014.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_jpa014.htm @@ -88,7 +88,7 @@ <h1>Hibernate Configuration Wizard: Select Data Source</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven.htm index df9a66b6f..0657ed9b7 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven.htm @@ -45,7 +45,7 @@ <h1>Using Maven</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven001.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven001.htm index f3e37160b..c50a80eca 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven001.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven001.htm @@ -122,7 +122,7 @@ <h1>New Maven Project Wizard: Maven Archetype</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven002.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven002.htm index 0ed2b7039..726254328 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven002.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven002.htm @@ -114,7 +114,7 @@ <h1>New Maven Project Wizard: Name and Location</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven003.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven003.htm index 5d11c1011..19368fad3 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven003.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven003.htm @@ -58,7 +58,7 @@ <h1>New Maven Project Wizard: Project with Existing POM</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven004.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven004.htm index 636488d57..e1a372031 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven004.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven004.htm @@ -94,7 +94,7 @@ <h1>New Maven Project Wizard: Module Options</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven005.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven005.htm index 0f13f91b8..c53c94791 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven005.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven005.htm @@ -226,7 +226,7 @@ <h1>Options Window: Java: Maven</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven006.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven006.htm index fc1438372..d3b719fcc 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven006.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_maven006.htm @@ -399,7 +399,7 @@ <h1>Project Properties: Maven Project</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial.htm index ee357f64f..f3cbf4b95 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial.htm @@ -45,7 +45,7 @@ <h1>Using Mercurial</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial001.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial001.htm index 4bf6e35f5..8ee47f8e6 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial001.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial001.htm @@ -91,7 +91,7 @@ <h1>Mercurial: Clone Repository Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial002.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial002.htm index 8cd8007ca..b97a8215e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial002.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial002.htm @@ -80,7 +80,7 @@ <h1>Mercurial: Initialize a Mercurial Repository Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial003.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial003.htm index d7f1cda1c..8dddc1a35 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial003.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial003.htm @@ -142,7 +142,7 @@ <h1>Mercurial: Export Diff Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial004.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial004.htm index c0ee206bc..e66dd1d94 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial004.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial004.htm @@ -110,7 +110,7 @@ <h1>Mercurial: Pull Other Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial005.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial005.htm index 3bf70e132..4984de30b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial005.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial005.htm @@ -110,7 +110,7 @@ <h1>Mercurial: Push Other Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial006.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial006.htm index c209c1093..ad68ac111 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial006.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial006.htm @@ -80,7 +80,7 @@ <h1>Mercurial: Merge Revisions Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial007.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial007.htm index 1c0206661..54e862752 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial007.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial007.htm @@ -79,7 +79,7 @@ <h1>Mercurial: Revert Modifications Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial008.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial008.htm index 89723bb88..d2977d293 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial008.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial008.htm @@ -79,7 +79,7 @@ <h1>Mercurial: Update Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial009.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial009.htm index 1ca94fbb8..7a2441cca 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial009.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial009.htm @@ -75,7 +75,7 @@ <h1>Mercurial: Select Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial010.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial010.htm index c2159d2f2..c19617516 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial010.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial010.htm @@ -171,7 +171,7 @@ <h1>Mercurial: Create Patch Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial011.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial011.htm index 3575b7d54..fb134cbcf 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial011.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial011.htm @@ -179,7 +179,7 @@ <h1>Mercurial: Refresh Patch Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial012.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial012.htm index 08a00af34..10729fb29 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial012.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial012.htm @@ -81,7 +81,7 @@ <h1>Mercurial: Go To Patch Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial013.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial013.htm index 73fec238f..cf5aad55f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial013.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial013.htm @@ -80,7 +80,7 @@ <h1>Mercurial: Finish Patches Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial014.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial014.htm index 042a00c1d..e552d44d8 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial014.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial014.htm @@ -106,7 +106,7 @@ <h1>Mercurial: Select Template Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial015.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial015.htm index ee01b0049..27a28ed4c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial015.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial015.htm @@ -109,7 +109,7 @@ <h1>Mercurial: Switch Branch In Repository Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial016.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial016.htm index 6e7e76854..a393494af 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial016.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial016.htm @@ -270,7 +270,7 @@ <h2>Search Options</h2> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial017.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial017.htm index 487355ffa..9a544596c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial017.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial017.htm @@ -99,7 +99,7 @@ <h1>Mercurial: Shelve Changes Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial018.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial018.htm index fcef076ad..dd4b697f1 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial018.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial018.htm @@ -157,7 +157,7 @@ <h1>Mercurial: Select Changesets to Rebase Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial019.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial019.htm index 05d89dae8..022814e27 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial019.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial019.htm @@ -103,7 +103,7 @@ <h1>Mercurial: Create Tag Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial020.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial020.htm index b14145578..7d06f2a41 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial020.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial020.htm @@ -78,7 +78,7 @@ <h1>Mercurial: Create Branch Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial021.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial021.htm index 19ccc67d2..4e01f2b3b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial021.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial021.htm @@ -120,7 +120,7 @@ <h1>Mercurial: Manage Tags Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial022.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial022.htm index 8397e9b1c..24f83c78d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial022.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial022.htm @@ -90,7 +90,7 @@ <h1>Mercurial: Select Revisions to Diff Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial023.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial023.htm index 63ceb95a5..635ac9480 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial023.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial023.htm @@ -104,7 +104,7 @@ <h1>Mercurial: Select Changeset Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial024.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial024.htm index 957c233a6..b70d0f4ad 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial024.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial024.htm @@ -113,7 +113,7 @@ <h1>Mercurial: Backout Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial025.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial025.htm index 25ea72457..f318c49f2 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial025.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial025.htm @@ -111,7 +111,7 @@ <h1>Mercurial: Strip Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial026.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial026.htm index 5b3fddd54..002b58d6f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial026.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial026.htm @@ -104,7 +104,7 @@ <h1>Mercurial: Clone External Repository Wizard: Mercurial Repository</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial027.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial027.htm index bcbb07229..69676bea0 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial027.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial027.htm @@ -91,7 +91,7 @@ <h1>Mercurial: Clone External Repository Wizard: Mercurial Paths</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial028.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial028.htm index 177025968..e3798f29a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial028.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial028.htm @@ -103,7 +103,7 @@ <h1>Mercurial: Clone External Repository Wizard: Change Path</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial029.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial029.htm index adbf1383c..167bfa97d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial029.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial029.htm @@ -91,7 +91,7 @@ <h1>Mercurial: Clone External Repository Wizard: Destination Directory</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial030.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial030.htm index 82b606a4f..013cfb31e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial030.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_mercurial030.htm @@ -178,7 +178,7 @@ <h1>Mercurial: Commit Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules.htm index 62bd60369..83419d69f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules.htm @@ -37,7 +37,7 @@ <h1>Working with NetBeans Modules</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules001.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules001.htm index 949a1922e..45fe67a8d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules001.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules001.htm @@ -103,7 +103,7 @@ <h1>Action Wizard: Name, Icon, and Location</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules002.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules002.htm index b543e5f21..1cdc32408 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules002.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules002.htm @@ -103,7 +103,7 @@ <h1>Action Wizard: Action Type</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules003.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules003.htm index d6205adae..1cedb6b1e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules003.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules003.htm @@ -86,7 +86,7 @@ <h1>Add Module Dependency Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules004.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules004.htm index 7f7022f5b..08614dc06 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules004.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules004.htm @@ -60,7 +60,7 @@ <h1>Add New Friend Module Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules005.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules005.htm index 52295b4b2..ef22f473c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules005.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules005.htm @@ -95,7 +95,7 @@ <h1>Module Project: Basic Module Configuration</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules006.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules006.htm index 0e6784248..534aa1490 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules006.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules006.htm @@ -103,7 +103,7 @@ <h1>Module Project: Name and Location</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules007.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules007.htm index 799ad697e..61cd48838 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules007.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules007.htm @@ -98,7 +98,7 @@ <h1>NetBeans Platform Application Project: Name and Location</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules008.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules008.htm index ed4905c02..dec469ee4 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules008.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules008.htm @@ -97,7 +97,7 @@ <h1>Library Wrapper Module Project: Name and Location</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules009.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules009.htm index 4e08598d6..375eeb48f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules009.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules009.htm @@ -98,7 +98,7 @@ <h1>Module Suite Project: Name and Location</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules010.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules010.htm index fb0c4ff0c..754209a17 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules010.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules010.htm @@ -142,7 +142,7 @@ <h1>Window Wizard: Basic Settings</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules011.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules011.htm index dede864b6..8a24b7e45 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules011.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules011.htm @@ -106,7 +106,7 @@ <h1>Code Generator Wizard: Code Generator</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules012.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules012.htm index bf2ba4929..7d0002c3e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules012.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules012.htm @@ -109,7 +109,7 @@ <h1>Feed Reader Sample</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules013.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules013.htm index 337376fd9..050bbd19f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules013.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules013.htm @@ -109,7 +109,7 @@ <h1>File Type: File Recognition</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules014.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules014.htm index 4c0677bc5..1368025cd 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules014.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules014.htm @@ -133,7 +133,7 @@ <h1>Action Wizard: GUI Registration</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules015.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules015.htm index 9d3508068..b8182c8a7 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules015.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules015.htm @@ -117,7 +117,7 @@ <h1>JavaHelp Help Set Wizard: Location</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules016.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules016.htm index 333cc28a1..84b403c0b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules016.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules016.htm @@ -93,7 +93,7 @@ <h1>Java SE Library Descriptor Wizard: Name and Location</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules017.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules017.htm index 9e1c1045d..3d623964c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules017.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules017.htm @@ -91,7 +91,7 @@ <h1>Library Wrapper Module Project: Basic Module Configuration</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules018.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules018.htm index 7d6e05755..e8f7bb857 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules018.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules018.htm @@ -84,7 +84,7 @@ <h1>Library Wrapper Module Project: Select Library</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules019.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules019.htm index d3b27b78c..9080ac4f9 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules019.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules019.htm @@ -105,7 +105,7 @@ <h1>File Type: Name, Icon and Location</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules020.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules020.htm index 03ba86a6c..ff69c6791 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules020.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules020.htm @@ -79,7 +79,7 @@ <h1>Installer/Activator Wizard: Installer/Activator</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules021.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules021.htm index 64b0bec2b..bdba77a4c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules021.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules021.htm @@ -106,7 +106,7 @@ <h1>NetBeans Platform Manager Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules022.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules022.htm index 428666182..75f2ff788 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules022.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules022.htm @@ -86,7 +86,7 @@ <h1>Options Panel Wizard: Location</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules023.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules023.htm index a1472bb17..9fcd5d2a1 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules023.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules023.htm @@ -104,7 +104,7 @@ <h1>Options Panel Wizard: Choose Panel Type</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules024.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules024.htm index 3c3af263c..202fe5690 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules024.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules024.htm @@ -96,7 +96,7 @@ <h1>Project Template Wizard: Name and Location</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules025.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules025.htm index 3254a3ec0..f8d3d572c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules025.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules025.htm @@ -104,7 +104,7 @@ <h1>Quick Search Provider Wizard: Quick Search Provider</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules026.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules026.htm index 0c823e721..da2b6210c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules026.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules026.htm @@ -67,7 +67,7 @@ <h1>Java SE Library Descriptor Wizard: Select Library</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules027.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules027.htm index d5d53cb8b..ab816518e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules027.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules027.htm @@ -67,7 +67,7 @@ <h1>Project Template Wizard: Select Project</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules028.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules028.htm index 282ae6195..e606e4432 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules028.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules028.htm @@ -93,7 +93,7 @@ <h1>Update Center Wizard: Update Center Declaration</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules029.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules029.htm index 0ffb912e5..d541eed25 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules029.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules029.htm @@ -92,7 +92,7 @@ <h1>Window Wizard: Name, Icon and Location</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules030.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules030.htm index d515d7738..dee050cc8 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules030.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules030.htm @@ -127,7 +127,7 @@ <h1>Wizard Wizard: Name, Icon, and Location</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules031.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules031.htm index ef4758098..4d1c540bc 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules031.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules031.htm @@ -102,7 +102,7 @@ <h1>Wizard Wizard: Wizard Type</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules032.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules032.htm index 1ec21a76e..4fc6a93c2 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules032.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules032.htm @@ -84,7 +84,7 @@ <h1>Module Project Properties Dialog Box: Compiling</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules033.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules033.htm index 1708203b8..d5f9e2d7b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules033.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules033.htm @@ -96,7 +96,7 @@ <h1>Module Project Properties Dialog Box: Display</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules034.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules034.htm index 8d2dff021..f0e3088f7 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules034.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules034.htm @@ -71,7 +71,7 @@ <h1>Module Project Properties Dialog Box: Documenting</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules035.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules035.htm index 5fdc0353b..8835fefcc 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules035.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules035.htm @@ -107,7 +107,7 @@ <h1>Module Project Properties Dialog Box: Libraries</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules036.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules036.htm index 8fb663735..2834468d0 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules036.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules036.htm @@ -103,7 +103,7 @@ <h1>Module Project Properties Dialog Box: Packaging</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules037.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules037.htm index 893cd79ab..2df91523e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules037.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules037.htm @@ -91,7 +91,7 @@ <h1>Module Project Properties Dialog Box: Sources</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules038.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules038.htm index a78e0786b..442295ba2 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules038.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules038.htm @@ -133,7 +133,7 @@ <h1>Module Project Properties Dialog Box: API Versioning</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules039.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules039.htm index 208dd21a7..419652840 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules039.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules039.htm @@ -58,7 +58,7 @@ <h1>Edit Module Dependency Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules040.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules040.htm index a7a8686ea..b4af4fa2c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules040.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules040.htm @@ -92,7 +92,7 @@ <h1>Module Suite Project Properties Dialog Box: Application</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules041.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules041.htm index 3c3881a3f..77ca1bbaf 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules041.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules041.htm @@ -93,7 +93,7 @@ <h1>Module Suite Project Properties Dialog Box: Libraries</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules042.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules042.htm index d043bb727..f5dd11ce8 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules042.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules042.htm @@ -59,7 +59,7 @@ <h1>Module Suite Project Properties Dialog Box: Module List</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules043.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules043.htm index 999519943..453b54351 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules043.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules043.htm @@ -85,7 +85,7 @@ <h1>Module Suite Project Properties Dialog Box: Sources</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules044.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules044.htm index d1e52f355..e236db2c1 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules044.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules044.htm @@ -104,7 +104,7 @@ <h1>Module Suite Project Properties Dialog Box: Splash Screen</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules045.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules045.htm index 31a70c88c..db3103666 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules045.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_modules045.htm @@ -116,7 +116,7 @@ <h1>Module Suite Project Properties Dialog Box: Window System</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php.htm index 449d772bb..60fa5c7fe 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php.htm @@ -45,7 +45,7 @@ <h1>Using PHP</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php001.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php001.htm index 338a18f0b..1e9270535 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php001.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php001.htm @@ -121,7 +121,7 @@ <h1>New PHP Project Wizard: Name and Location</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php002.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php002.htm index 87839167f..2f250318b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php002.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php002.htm @@ -108,7 +108,7 @@ <h1>New PHP Application from Remote Server: Name and Location</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php003.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php003.htm index 7522d845b..3dd8458b7 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php003.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php003.htm @@ -109,7 +109,7 @@ <h1>New PHP Project with Existing Sources: Name and Location</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php004.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php004.htm index da74091b6..5eb68e573 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php004.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php004.htm @@ -168,7 +168,7 @@ <h1>New PHP Project Wizard: Run Configuration</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php005.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php005.htm index b8a92d6c3..c620319c0 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php005.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php005.htm @@ -169,7 +169,7 @@ <h1>New PHP Project with Existing Sources: Run Configuration</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php006.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php006.htm index a86bca475..82dbc1e79 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php006.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php006.htm @@ -90,7 +90,7 @@ <h1>New PHP Application from Remote Server: Remote Connection</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php007.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php007.htm index a576ab4b6..8b4e3ad2c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php007.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php007.htm @@ -71,7 +71,7 @@ <h1>New PHP Project Wizard: PHP Frameworks</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php008.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php008.htm index 47602247d..5eebf82e4 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php008.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php008.htm @@ -161,7 +161,7 @@ <h1>Manage Remote Connections Window</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php009.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php009.htm index e4aed480a..0fcea0ee1 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php009.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php009.htm @@ -113,7 +113,7 @@ <h1>Project Properties Window: Sources</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php010.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php010.htm index 3307d9e41..84b675b77 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php010.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php010.htm @@ -126,7 +126,7 @@ <h1>Project Properties Window: Run Configuration</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php011.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php011.htm index f179ce761..2c21ec278 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php011.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php011.htm @@ -124,7 +124,7 @@ <h1>Project Properties Window: Annotations</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php012.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php012.htm index 44b9caf48..f2cac1728 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php012.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php012.htm @@ -104,7 +104,7 @@ <h1>Advanced Web Configuration Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php013.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php013.htm index 5a746888f..d484c3d6c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php013.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php013.htm @@ -73,7 +73,7 @@ <h1>Project Properties Window: Include Path</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php014.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php014.htm index 1328004a2..01c5967f8 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php014.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php014.htm @@ -81,7 +81,7 @@ <h1>Project Properties Window: Ignored Folders</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php015.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php015.htm index ede1dd0a5..7fa1782c8 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php015.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php015.htm @@ -112,7 +112,7 @@ <h1>Project Properties Window: PHPUnit</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php016.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php016.htm index 0115556ef..be1ad5add 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php016.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php016.htm @@ -79,7 +79,7 @@ <h1>Project Properties Window: PHPDoc</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php017.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php017.htm index 1d7a3e9e1..0e62e5537 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php017.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php017.htm @@ -140,7 +140,7 @@ <h1>Project Properties Window: ApiGen</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php018.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php018.htm index a7c9c61a3..81e79b6c3 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php018.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php018.htm @@ -242,7 +242,7 @@ <h1>Remote Synchronization Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php019.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php019.htm index d6c42f7a9..824bc9152 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php019.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php019.htm @@ -101,7 +101,7 @@ <h1>Find Usages Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php020.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php020.htm index cb572f134..8228a04c6 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php020.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php020.htm @@ -89,7 +89,7 @@ <h1>Rename Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php021.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php021.htm index 1fa4a535c..d99b039c5 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php021.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php021.htm @@ -126,7 +126,7 @@ <h1>Refactoring Window</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php022.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php022.htm index df584f376..94870f7bd 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php022.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php022.htm @@ -103,7 +103,7 @@ <h1>Delete Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php023.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php023.htm index 7aa42abe7..6cb33f676 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php023.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php023.htm @@ -101,7 +101,7 @@ <h1>Usages Window</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php024.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php024.htm index 9a36c8c78..2581de82c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php024.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php024.htm @@ -164,7 +164,7 @@ <h1>PHP Source Editor</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php025.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php025.htm index cf62814e7..cc80d9d03 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php025.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php025.htm @@ -93,7 +93,7 @@ <h1>Options Window: PHP: General</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php026.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php026.htm index a83d208f9..8c3d94bad 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php026.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php026.htm @@ -115,7 +115,7 @@ <h1>Options Window: PHP: Debugging</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php027.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php027.htm index caa461df9..ae0fbaf29 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php027.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php027.htm @@ -78,7 +78,7 @@ <h1>Options Window: PHP: Frameworks &amp; Tools: PHPUnit</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php028.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php028.htm index 4802ff2b5..76ab1b225 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php028.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php028.htm @@ -84,7 +84,7 @@ <h1>Options Window: PHP: Frameworks &amp; Tools: PhpDoc</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php029.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php029.htm index 7ef3c6fe9..b5347f21a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php029.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php029.htm @@ -85,7 +85,7 @@ <h1>Options Window: PHP: Frameworks &amp; Tools: Symfony</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php030.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php030.htm index 6cec87cb5..1f2ef7e82 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php030.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php030.htm @@ -79,7 +79,7 @@ <h1>Options Window: PHP: Frameworks &amp; Tools: Symfony2</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php031.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php031.htm index 7ea2fb2d4..501112dc6 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php031.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php031.htm @@ -77,7 +77,7 @@ <h1>Options Window: PHP: Frameworks &amp; Tools: Zend</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php032.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php032.htm index 8ce2e3afb..613370174 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php032.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php032.htm @@ -99,7 +99,7 @@ <h1>Options Window: PHP: Frameworks &amp; Tools: Smarty</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php033.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php033.htm index 7ac1b1bb1..466748002 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php033.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php033.htm @@ -96,7 +96,7 @@ <h1>Options Window: PHP: Custom Annotation Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php034.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php034.htm index 25811e2cb..b26371914 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php034.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php034.htm @@ -90,7 +90,7 @@ <h1>Options Window: PHP: Annotations</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php035.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php035.htm index 8bb83a1a2..e5c71f77d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php035.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php035.htm @@ -131,7 +131,7 @@ <h1>Options Window: PHP: Code Analysis</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php036.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php036.htm index 05d883e48..7c42c7b14 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php036.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php036.htm @@ -72,7 +72,7 @@ <h1>Options Window: PHP: Frameworks &amp; Tools: ApiGen</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php037.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php037.htm index 58a8bf1ae..935fd6e60 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php037.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php037.htm @@ -72,7 +72,7 @@ <h1>Options Window: PHP: Frameworks &amp; Tools: Doctrine2</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php038.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php038.htm index 76f77a811..730dc27c0 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php038.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php038.htm @@ -100,7 +100,7 @@ <h1>Options Window: PHP: Hudson</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php039.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php039.htm index 1bbc1b110..fdce17d03 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php039.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php039.htm @@ -85,7 +85,7 @@ <h1>Options Window: PHP: Frameworks &amp; Tools: Twig</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php040.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php040.htm index bea90c160..bc916f81d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php040.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php040.htm @@ -71,7 +71,7 @@ <h1>Options Window: PHP: Frameworks &amp; Tools: Zend2</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php041.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php041.htm index 6a08626ee..3027a69d1 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php041.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php041.htm @@ -89,7 +89,7 @@ <h1>Options Window: PHP: Frameworks &amp; Tools: Composer</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php042.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php042.htm index 9e58efdc0..193695f91 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php042.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php042.htm @@ -71,7 +71,7 @@ <h1>Options Window: PHP: Frameworks &amp; Tools: Atoum</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php043.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php043.htm index 9d1ca01a9..4e47b9fe3 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php043.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_php043.htm @@ -78,7 +78,7 @@ <h1>Options Window: PHP: Frameworks &amp; Tools: Nette Tester</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler.htm index e8ff2b561..959154008 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler.htm @@ -45,7 +45,7 @@ <h1>Profiling</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler001.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler001.htm index 33e901ac9..d50e5d843 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler001.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler001.htm @@ -132,7 +132,7 @@ <h1>Attach Profiler: Attach Settings Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler002.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler002.htm index f6f407699..80f103263 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler002.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler002.htm @@ -88,7 +88,7 @@ <h1>Choose Heap Dump Destination Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler003.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler003.htm index fe492ddd0..e5af6136f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler003.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler003.htm @@ -93,7 +93,7 @@ <h1>OQL Console: Query Properties Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler004.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler004.htm index ff10e5439..3306f6b4c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler004.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler004.htm @@ -106,7 +106,7 @@ <h1>OQL Console: Save Query Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler005.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler005.htm index d3d9874e3..638adcfd0 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler005.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler005.htm @@ -118,7 +118,7 @@ <h1>New Profiling Point Wizard</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler006.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler006.htm index 21d64fa35..2fb1a3428 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler006.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler006.htm @@ -118,7 +118,7 @@ <h1>New Profiling Point Wizard: Choose Type and Project</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler007.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler007.htm index 542c80675..96a0cf41e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler007.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler007.htm @@ -112,7 +112,7 @@ <h1>New Profiling Point Wizard: Reset Results</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler008.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler008.htm index fbe6036e2..cc2efb053 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler008.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler008.htm @@ -134,7 +134,7 @@ <h1>New Profiling Point Wizard: Stopwatch</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler009.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler009.htm index 50de6d7b3..45639920e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler009.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler009.htm @@ -132,7 +132,7 @@ <h1>New Profiling Point Wizard: Take Snapshot</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler010.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler010.htm index 45849e13e..0770c52ac 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler010.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler010.htm @@ -137,7 +137,7 @@ <h1>New Profiling Point Wizard: Timed Take Snapshot</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler011.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler011.htm index a292d7b7a..72367ed78 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler011.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler011.htm @@ -137,7 +137,7 @@ <h1>New Profiling Point Wizard: Triggered Take Snapshot</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler012.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler012.htm index c619e945e..ec41161ec 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler012.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler012.htm @@ -96,7 +96,7 @@ <h1>Active Profiling Points Window</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler013.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler013.htm index 2d53cfdd4..2845bc67b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler013.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler013.htm @@ -84,7 +84,7 @@ <h1>Select Heap Dump to Compare Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler014.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler014.htm index e633bb521..1057404b7 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler014.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler014.htm @@ -104,7 +104,7 @@ <h1>Select Snapshot to Compare Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler015.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler015.htm index 4736eb150..12cd9621c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler015.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler015.htm @@ -115,7 +115,7 @@ <h1>Manage Calibration Data Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler016.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler016.htm index 37dbfae43..c65a09456 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler016.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler016.htm @@ -94,7 +94,7 @@ <h1>CPU Snapshot: Find in Results Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler017.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler017.htm index 3926ae3a1..8526e832a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler017.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler017.htm @@ -65,7 +65,7 @@ <h1>Results Snapshot: Edit User Comments Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler018.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler018.htm index 37fd5a163..ad728b26a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler018.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler018.htm @@ -74,7 +74,7 @@ <h1>CPU Snapshot: Select Settings Configuration Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler019.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler019.htm index 877252ae9..163dd3c93 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler019.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler019.htm @@ -78,7 +78,7 @@ <h1>Profiler Window: Rename Snapshot Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler020.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler020.htm index fab131b28..eeda333cc 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler020.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler020.htm @@ -106,7 +106,7 @@ <h1>OQL Console</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler021.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler021.htm index 623ea3a80..1aa819a13 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler021.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler021.htm @@ -276,7 +276,7 @@ <h1>Options Window: Java: Profiler</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler022.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler022.htm index 12d214382..8fcb87671 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler022.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler022.htm @@ -218,7 +218,7 @@ <h1>Profiler Window</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler023.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler023.htm index 49b8b3c1a..bff21fc0e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler023.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler023.htm @@ -103,7 +103,7 @@ <h1>Profiling Points Window</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler024.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler024.htm index e0c733e9d..d51093407 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler024.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler024.htm @@ -64,7 +64,7 @@ <h1>Profiling Points Report Window</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler025.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler025.htm index d6341392a..bd0994971 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler025.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler025.htm @@ -92,7 +92,7 @@ <h1>CPU Snapshot Comparison</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler026.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler026.htm index e8b1911da..3873771c0 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler026.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler026.htm @@ -103,7 +103,7 @@ <h1>Memory Snapshot</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler027.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler027.htm index e7d976779..7b77b56ab 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler027.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler027.htm @@ -206,7 +206,7 @@ <h1>Memory Snapshot Comparison</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler028.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler028.htm index 02eb2958b..6362331f4 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler028.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler028.htm @@ -168,7 +168,7 @@ <h1>Profiling Threads Window</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler029.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler029.htm index 4c7878a07..2541fe07f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler029.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler029.htm @@ -109,7 +109,7 @@ <h1>Lock Contention Window</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler030.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler030.htm index 97a9e3213..d380f7728 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler030.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler030.htm @@ -66,7 +66,7 @@ <h1>Details of &lt;Process&gt; Dialog</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler031.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler031.htm index 983e348ee..1e8fab31e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler031.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler031.htm @@ -163,7 +163,7 @@ <h1>Select Method Dialog</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler032.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler032.htm index 119c5f948..1a7f9c7ad 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler032.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler032.htm @@ -133,7 +133,7 @@ <h1>Select Class Dialog</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler033.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler033.htm index 0b6690a5b..d0499243b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler033.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler033.htm @@ -108,7 +108,7 @@ <h1>Profile Class / Profile Method (Select Feature) Dialog</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler034.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler034.htm index c5e57cc9b..d3d729fe5 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler034.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler034.htm @@ -114,7 +114,7 @@ <h1>Snapshot Window</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler035.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler035.htm index 4431197d0..9ad2e1271 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler035.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler035.htm @@ -64,7 +64,7 @@ <h1>Snapshot Information</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler036.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler036.htm index 9af825bc3..096b98f46 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler036.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler036.htm @@ -115,7 +115,7 @@ <h1>Profile Window with Telemetry</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler037.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler037.htm index 30c5efccb..3ec66c5fd 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler037.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler037.htm @@ -165,7 +165,7 @@ <h1>Profile Window with Methods</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler038.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler038.htm index b1c093021..55870961d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler038.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler038.htm @@ -135,7 +135,7 @@ <h1>Profile Window with Objects</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler039.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler039.htm index 3a802488b..e04446a5a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler039.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler039.htm @@ -109,7 +109,7 @@ <h1>Profile Window with Threads</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler040.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler040.htm index 590be1ea6..9a6d3d068 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler040.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler040.htm @@ -97,7 +97,7 @@ <h1>Profile Window with Locks</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler041.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler041.htm index d41b194ea..5367cbc78 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler041.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler041.htm @@ -224,7 +224,7 @@ <h1>Profile Window with SQL Queries</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler042.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler042.htm index ed5c41bc6..79bcd6d4f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler042.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler042.htm @@ -57,7 +57,7 @@ <h1>Thread Dump Window</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler043.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler043.htm index 36b64e560..bd1886bc2 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler043.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler043.htm @@ -137,7 +137,7 @@ <h1>Methods Snapshot Dialog</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler044.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler044.htm index 20b9e627c..7a8e349d8 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler044.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler044.htm @@ -92,7 +92,7 @@ <h1>Objects Snapshot Dialog</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler045.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler045.htm index 45e5009c3..0bcbad8b7 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler045.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler045.htm @@ -103,7 +103,7 @@ <h1>Heap Walker Dialog</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler046.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler046.htm index 6dbd1643d..ecd71d10d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler046.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler046.htm @@ -70,7 +70,7 @@ <h1>SQL Query Viewer</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler047.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler047.htm index bff7ed203..e6ac3a362 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler047.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler047.htm @@ -78,7 +78,7 @@ <h1>Add Filter</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler048.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler048.htm index ab271fe27..214d4d53f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler048.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_profiler048.htm @@ -78,7 +78,7 @@ <h1>Edit Filter</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor.htm index 12db04414..7f7bf2327 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor.htm @@ -37,7 +37,7 @@ <h1>Refactoring</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor001.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor001.htm index 579771c44..51b1bf5a1 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor001.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor001.htm @@ -123,7 +123,7 @@ <h1>Change Method Parameters Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor002.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor002.htm index c04e85cd2..2b11a659a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor002.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor002.htm @@ -91,7 +91,7 @@ <h1>Copy Class Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor003.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor003.htm index f788b2186..adf7948b3 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor003.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor003.htm @@ -142,7 +142,7 @@ <h1>Encapsulate Fields Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor004.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor004.htm index d8dfb36f8..3792cf454 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor004.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor004.htm @@ -86,7 +86,7 @@ <h1>Extract Interface Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor005.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor005.htm index 538020dd0..c575a3c0e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor005.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor005.htm @@ -96,7 +96,7 @@ <h1>Introduce Method Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor006.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor006.htm index 974b5adb3..45770a47d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor006.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor006.htm @@ -87,7 +87,7 @@ <h1>Extract Superclass Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor007.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor007.htm index adeb1250a..627069137 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor007.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor007.htm @@ -167,7 +167,7 @@ <h1>Find Usages Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor008.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor008.htm index 9825008eb..2b0794ef5 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor008.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor008.htm @@ -90,7 +90,7 @@ <h1>Inline Refactoring</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor009.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor009.htm index 32af33f71..830d4a58c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor009.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor009.htm @@ -102,7 +102,7 @@ <h1>Inspect and Transform Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor010.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor010.htm index 18e9ed5b6..a195b3cf8 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor010.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor010.htm @@ -152,7 +152,7 @@ <h1>Introduce Local Extension Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor011.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor011.htm index 0d7bb475a..1c3cccc9c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor011.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor011.htm @@ -115,7 +115,7 @@ <h1>Introduce Parameter Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor012.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor012.htm index f057c1888..52c6adca5 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor012.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor012.htm @@ -81,7 +81,7 @@ <h1>Invert Boolean Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor013.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor013.htm index 2a5e4b742..6b5297751 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor013.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor013.htm @@ -90,7 +90,7 @@ <h1>Move Class Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor014.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor014.htm index 97311849a..9aaa44a5e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor014.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor014.htm @@ -92,7 +92,7 @@ <h1>Move Inner to Outer Level Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor015.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor015.htm index 4d0585dcf..2d9f4204e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor015.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor015.htm @@ -243,7 +243,7 @@ <h1>Move Members Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor016.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor016.htm index 0eec877f3..a6ef1d646 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor016.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor016.htm @@ -64,7 +64,7 @@ <h1>Refactoring Window</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor017.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor017.htm index e533724ac..dde71b9a1 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor017.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor017.htm @@ -87,7 +87,7 @@ <h1>Pull Up Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor018.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor018.htm index d3a01cac6..c91a39ef3 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor018.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor018.htm @@ -81,7 +81,7 @@ <h1>Push Down Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor019.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor019.htm index 79bcddbd9..d0745195b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor019.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor019.htm @@ -256,7 +256,7 @@ <h1>Syntax Rules for Declarative Hints</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor020.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor020.htm index 944eda3e5..a5d275dc8 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor020.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor020.htm @@ -105,7 +105,7 @@ <h1>Rename Class Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor021.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor021.htm index 48f50c4af..b5cdec44d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor021.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor021.htm @@ -105,7 +105,7 @@ <h1>Rename Method Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor022.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor022.htm index 3dac614a3..e159d5591 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor022.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor022.htm @@ -105,7 +105,7 @@ <h1>Rename Field Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor023.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor023.htm index f2dcf1faf..f07fde6d1 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor023.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor023.htm @@ -110,7 +110,7 @@ <h1>Replace Constructor With Builder Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor024.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor024.htm index 414f78df4..5aed4b79a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor024.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor024.htm @@ -80,7 +80,7 @@ <h1>Replace Constructor Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor025.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor025.htm index 56620b6b7..683c6d7e2 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor025.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor025.htm @@ -87,7 +87,7 @@ <h1>Safe Delete Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor026.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor026.htm index 6b2a83145..258d1d6a3 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor026.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor026.htm @@ -62,7 +62,7 @@ <h1>Usages Window</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor027.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor027.htm index 2af7db931..4c4299f06 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor027.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_refactor027.htm @@ -81,7 +81,7 @@ <h1>Use Supertype Where Possible Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion.htm index a78f5acd8..866afb971 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion.htm @@ -45,7 +45,7 @@ <h1>Using Subversion</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion001.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion001.htm index e69a255e5..e46fee21a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion001.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion001.htm @@ -153,7 +153,7 @@ <h1>Subversion Checkout Wizard: Subversion Repository</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion002.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion002.htm index f165b0ca1..0f384f473 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion002.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion002.htm @@ -93,7 +93,7 @@ <h1>Subversion Checkout Wizard: Folders to Checkout</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion003.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion003.htm index e368863a3..a6747b4f8 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion003.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion003.htm @@ -141,7 +141,7 @@ <h1>Subversion: Commit Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion004.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion004.htm index 212c333a0..6c15089ac 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion004.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion004.htm @@ -126,7 +126,7 @@ <h1>Subversion: Copy Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion005.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion005.htm index 2988d4179..6d2b320f1 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion005.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion005.htm @@ -249,7 +249,7 @@ <h1>Subversion: Diff Viewer</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion006.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion006.htm index faa55a248..c5e0cd83a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion006.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion006.htm @@ -154,7 +154,7 @@ <h1>Subversion Import Wizard: Subversion Repository</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion007.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion007.htm index cb46c3d20..f93337273 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion007.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion007.htm @@ -90,7 +90,7 @@ <h1>Subversion Import Wizard: Repository Folder</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion008.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion008.htm index a621b2588..05e4f5abe 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion008.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion008.htm @@ -152,7 +152,7 @@ <h1>Subversion Import Wizard: Files to Import</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion009.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion009.htm index b83c36db2..8eca88c94 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion009.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion009.htm @@ -90,7 +90,7 @@ <h1>Subversion: Property Editor</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion010.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion010.htm index 4773f6d32..9c8e9a593 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion010.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion010.htm @@ -134,7 +134,7 @@ <h1>Subversion: Merge Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion011.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion011.htm index 38b2b3ddc..d069d4012 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion011.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion011.htm @@ -123,7 +123,7 @@ <h1>Subversion: Relocate Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion012.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion012.htm index 54f05b419..c286b6e50 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion012.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion012.htm @@ -92,7 +92,7 @@ <h1>Subversion: Revert Modifications Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion013.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion013.htm index 9686d1231..fe5ceadf3 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion013.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion013.htm @@ -163,7 +163,7 @@ <h1>Subversion: History Viewer</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion014.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion014.htm index 1043b6ba1..1ccf6f31d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion014.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion014.htm @@ -86,7 +86,7 @@ <h1>Subversion: Switch Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion015.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion015.htm index 77b6769fd..2f9167ebe 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion015.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion015.htm @@ -146,7 +146,7 @@ <h1>Subversion: Versioning Window</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion016.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion016.htm index 055f65a7a..e47f1a647 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion016.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion016.htm @@ -91,7 +91,7 @@ <h1>Subversion: Property Editor</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion017.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion017.htm index f867a3958..c0189ce60 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion017.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion017.htm @@ -98,7 +98,7 @@ <h1>Subversion: Certificate Verification Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion018.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion018.htm index d6425e6f5..ecf4b3f0d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion018.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion018.htm @@ -91,7 +91,7 @@ <h1>Subversion: Manage Labels Dialog</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion019.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion019.htm index 22a9c780d..241e3cd76 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion019.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion019.htm @@ -80,7 +80,7 @@ <h1>Subversion: Select Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion020.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion020.htm index 17fcf5cab..ce9950210 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion020.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion020.htm @@ -82,7 +82,7 @@ <h1>Subversion: Search Revisions Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion021.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion021.htm index 40c222f63..ed0e71c5a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion021.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion021.htm @@ -82,7 +82,7 @@ <h1>Subversion: Search Revisions Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion022.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion022.htm index 9a6224b36..c5d152058 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion022.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion022.htm @@ -82,7 +82,7 @@ <h1>Subversion: Search Revisions Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion023.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion023.htm index 639383893..2dc47375e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion023.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion023.htm @@ -82,7 +82,7 @@ <h1>Subversion: Search Revisions Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion024.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion024.htm index 99a3014be..77a7e15ed 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion024.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion024.htm @@ -82,7 +82,7 @@ <h1>Subversion: Search Revisions Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion025.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion025.htm index aa69fad6d..43d6622c5 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion025.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion025.htm @@ -82,7 +82,7 @@ <h1>Subversion: Search Revisions Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion026.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion026.htm index 3de0418b9..5d86be421 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion026.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion026.htm @@ -80,7 +80,7 @@ <h1>Subversion: Browse Repository Folders Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion027.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion027.htm index e52ed9048..ece98b9b5 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion027.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion027.htm @@ -80,7 +80,7 @@ <h1>Subversion: Browse Repository Folders Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion028.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion028.htm index 578baca84..ef014a5c0 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion028.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion028.htm @@ -80,7 +80,7 @@ <h1>Subversion: Browse Repository Folders Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion029.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion029.htm index 08ec080a6..e8ed0e313 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion029.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion029.htm @@ -80,7 +80,7 @@ <h1>Subversion: Browse Repository Folders Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion030.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion030.htm index ffa32d5f6..f97cc0364 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion030.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion030.htm @@ -80,7 +80,7 @@ <h1>Subversion: Browse Repository Folders Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion031.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion031.htm index d85d974be..39957efe2 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion031.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion031.htm @@ -80,7 +80,7 @@ <h1>Subversion: Browse Repository Folders Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion032.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion032.htm index 7ebcfe264..1e067fe96 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion032.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion032.htm @@ -80,7 +80,7 @@ <h1>Subversion: Browse Repository Folders Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion033.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion033.htm index 8f41d0452..9a68726c8 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion033.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion033.htm @@ -80,7 +80,7 @@ <h1>Versioning: Open Projects Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion034.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion034.htm index 6218e7caf..c6221dffb 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion034.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion034.htm @@ -106,7 +106,7 @@ <h1>Subversion: Select Template Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion035.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion035.htm index f60eb4a30..e4af750bb 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion035.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion035.htm @@ -82,7 +82,7 @@ <h1>Subversion: Shelve Changes Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion036.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion036.htm index 9cb649b4b..93defd7d5 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion036.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion036.htm @@ -81,7 +81,7 @@ <h1>Subversion: Manage Connection Settings Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion037.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion037.htm index 555a3658e..2b25014a0 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion037.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_subversion037.htm @@ -87,7 +87,7 @@ <h1>Subversion: Select Tree To Diff Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_team.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_team.htm index d8266bff3..13acd0a15 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_team.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_team.htm @@ -45,7 +45,7 @@ <h1>Team Server</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_team001.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_team001.htm index 9b734285d..c42f7736b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_team001.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_team001.htm @@ -98,7 +98,7 @@ <h1>New Team Project Wizard: Name and Licenses</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_team002.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_team002.htm index 6258c1d1e..36d6730e1 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_team002.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_team002.htm @@ -138,7 +138,7 @@ <h1>New Team Project Wizard: Source Code and Issues</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_team003.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_team003.htm index 28756d495..6cd042a9e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_team003.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_team003.htm @@ -63,7 +63,7 @@ <h1>New Team Project Wizard: Summary</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit.htm index aea5a2d6f..f15e59de2 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit.htm @@ -45,7 +45,7 @@ <h1>Using Unit Test</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit001.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit001.htm index 560afb48f..118eeb306 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit001.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit001.htm @@ -71,7 +71,7 @@ <h1>Select JUnit Version Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit002.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit002.htm index c7bfa498c..eeff7c1e7 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit002.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit002.htm @@ -138,7 +138,7 @@ <h1>Create Tests Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit003.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit003.htm index 5a823e20e..2dd18c017 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit003.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit003.htm @@ -134,7 +134,7 @@ <h1>New JUnit Test Wizard: Name and Location</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit004.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit004.htm index 8e272a7c3..ffa77e2b2 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit004.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit004.htm @@ -135,7 +135,7 @@ <h1>New JUnit Test Suite Wizard: Name and Location</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit005.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit005.htm index 1415e08ba..c657a7f2c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit005.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit005.htm @@ -134,7 +134,7 @@ <h1>New TestNG Test Case Wizard: Name and Location</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit006.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit006.htm index dd62c2c37..53320c259 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit006.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit006.htm @@ -168,7 +168,7 @@ <h1>New Test For Existing Class Wizard: Existing Class To Test</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit007.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit007.htm index 87502837f..1afda4abd 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit007.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_unit007.htm @@ -122,7 +122,7 @@ <h1>Unit Test Results Window</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps.htm index 016a21908..76ceeca1a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps.htm @@ -45,7 +45,7 @@ <h1>Web Applications</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps001.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps001.htm index 85a3109e4..c28e46e7c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps001.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps001.htm @@ -254,7 +254,7 @@ <h1>web.xml Visual Editor: General</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps002.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps002.htm index e648d89d5..6db74dbd6 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps002.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps002.htm @@ -131,7 +131,7 @@ <h1>web.xml Visual Editor: Context Parameters</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps003.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps003.htm index 9e63fae6b..192b77c99 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps003.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps003.htm @@ -102,7 +102,7 @@ <h1>web.xml Visual Editor: Web Application Listeners</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps004.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps004.htm index 636806536..4195428a2 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps004.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps004.htm @@ -228,7 +228,7 @@ <h1>web.xml Visual Editor: Servlets</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps005.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps005.htm index 9da1c0336..5320735c6 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps005.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps005.htm @@ -217,7 +217,7 @@ <h1>web.xml Visual Editor: Servlet Filters</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps006.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps006.htm index 0d4e7f2c3..e37b58198 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps006.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps006.htm @@ -95,7 +95,7 @@ <h1>web.xml Visual Editor: Welcome Files</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps007.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps007.htm index 3715c4464..76608b908 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps007.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps007.htm @@ -102,7 +102,7 @@ <h1>web.xml Visual Editor: Error Pages</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps008.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps008.htm index d375d062a..fcdff9945 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps008.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps008.htm @@ -171,7 +171,7 @@ <h1>web.xml Visual Editor: JSP Property Groups</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps009.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps009.htm index 306581f44..77669b962 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps009.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps009.htm @@ -131,7 +131,7 @@ <h1>web.xml Visual Editor: EJB References</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps010.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps010.htm index 885bb6c3a..54f37e2ca 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps010.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps010.htm @@ -123,7 +123,7 @@ <h1>web.xml Visual Editor: Environment Entries</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps011.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps011.htm index a6e49f0df..687a2a69a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps011.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps011.htm @@ -121,7 +121,7 @@ <h1>web.xml Visual Editor: Message Destination References</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps012.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps012.htm index 487eddc4e..9285bc44f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps012.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps012.htm @@ -108,7 +108,7 @@ <h1>web.xml Visual Editor: Resource Environment References</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps013.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps013.htm index de08ea3ac..6101adda6 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps013.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps013.htm @@ -154,7 +154,7 @@ <h1>web.xml Visual Editor: Resource References</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps014.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps014.htm index b58e5b8b7..db79ec455 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps014.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps014.htm @@ -110,7 +110,7 @@ <h1>web.xml Visual Editor: Login Configuration</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps015.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps015.htm index a84445b48..ccc8dcc52 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps015.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps015.htm @@ -163,7 +163,7 @@ <h1>web.xml Visual Editor: Security Constraints</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps016.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps016.htm index 9598117c1..e942786c2 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps016.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps016.htm @@ -92,7 +92,7 @@ <h1>web.xml Visual Editor: Security Roles</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps017.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps017.htm index 77871c846..3ff2ce72d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps017.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps017.htm @@ -114,7 +114,7 @@ <h1>Cloud Providers Manager</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps018.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps018.htm index 3acf391e0..87a9e4269 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps018.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps018.htm @@ -108,7 +108,7 @@ <h1>HTTP Server-Side Monitor</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps019.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps019.htm index 1cb6bc23b..f7353eff8 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps019.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps019.htm @@ -139,7 +139,7 @@ <h1>Standard Web Project Properties Dialog Box: Frameworks</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps020.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps020.htm index dff0babbe..7a1f62e48 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps020.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps020.htm @@ -200,7 +200,7 @@ <h1>Standard Web Project Properties Dialog Box: JAX-RPC Web Service Clients</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps021.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps021.htm index 3ecd750d3..777a12665 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps021.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps021.htm @@ -59,7 +59,7 @@ <h1>Standard Web Project Properties Dialog Box: Disabled JAX-RPC Web Service Cli <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps022.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps022.htm index 6470b9a63..cfef33f14 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps022.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps022.htm @@ -267,7 +267,7 @@ <h1>Standard Web Project Properties Dialog Box: JAX-RPC Web Services</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps023.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps023.htm index 234128979..9435703af 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps023.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps023.htm @@ -59,7 +59,7 @@ <h1>Standard Web Project Properties Dialog Box: Disabled JAX-RPC Web Services</h <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps024.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps024.htm index a582a6b1b..db314c706 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps024.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps024.htm @@ -144,7 +144,7 @@ <h1>Standard Web Project Properties Dialog Box: Compiling</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps025.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps025.htm index e97524292..d2179b09d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps025.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps025.htm @@ -154,7 +154,7 @@ <h1>Standard Web Project Properties Dialog Box: Documenting</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps026.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps026.htm index a42253f4e..eca159b8c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps026.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps026.htm @@ -160,7 +160,7 @@ <h1>Standard Web Project Properties Dialog Box: Libraries</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps027.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps027.htm index 6903e3d75..ee3df3769 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps027.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps027.htm @@ -143,7 +143,7 @@ <h1>Standard Web Project Properties Dialog Box: Run</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps028.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps028.htm index 864d9e0e2..976c46c73 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps028.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps028.htm @@ -210,7 +210,7 @@ <h1>Standard Web Project Properties Dialog Box: Sources</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps029.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps029.htm index d49872544..aecfc3fc1 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps029.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps029.htm @@ -127,7 +127,7 @@ <h1>Standard Web Project Properties Dialog Box: Packaging</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps030.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps030.htm index 83ecb5a21..4da86c003 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps030.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps030.htm @@ -105,7 +105,7 @@ <h1>Free-Form Project Properties Dialog Box: Web Sources</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps031.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps031.htm index f65f703f4..9492d5426 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps031.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps031.htm @@ -124,7 +124,7 @@ <h1>Free-Form Project Properties Dialog Box: Web Sources Classpath</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps032.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps032.htm index d7ae13c48..d9872daf9 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps032.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps032.htm @@ -60,7 +60,7 @@ <h1>HTTP Authentication dialog box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps033.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps033.htm index 5e70c550a..f32d15058 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps033.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps033.htm @@ -115,7 +115,7 @@ <h1>New Free-Form Project Wizard: Web Sources Classpath</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps034.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps034.htm index d3e2d5cd0..eb46b60e1 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps034.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps034.htm @@ -112,7 +112,7 @@ <h1>New Free-Form Project Wizard: Web Sources</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps035.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps035.htm index 895ff01ee..c9d2c325f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps035.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps035.htm @@ -132,7 +132,7 @@ <h1>JavaServer Faces Framework Configuration</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps036.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps036.htm index df3ca77cf..cf49dac4e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps036.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps036.htm @@ -112,7 +112,7 @@ <h1>New Web Application Wizard: Name and Location</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps037.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps037.htm index 1b5753716..d4df5c429 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps037.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps037.htm @@ -120,7 +120,7 @@ <h1>New Web Application Wizard: Server and Settings</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps038.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps038.htm index 398291ebf..8c1c845e6 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps038.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps038.htm @@ -182,7 +182,7 @@ <h1>New Web Application Wizard: Frameworks</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps039.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps039.htm index ee5cf2d47..c10fb31bf 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps039.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps039.htm @@ -108,7 +108,7 @@ <h1>New Web Project with Existing Sources Wizard: Server and Settings</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps040.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps040.htm index 6a8309857..31be3df8e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps040.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps040.htm @@ -123,7 +123,7 @@ <h1>New Web Project with Existing Sources Wizard: Existing Sources and Libraries <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps041.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps041.htm index ab92bf517..abcb28f24 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps041.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps041.htm @@ -97,7 +97,7 @@ <h1>New Web Application Wizard: Struts Framework</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps042.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps042.htm index 4f3dc4058..44f41aff8 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps042.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps042.htm @@ -111,7 +111,7 @@ <h1>New Web Project with Existing Sources Wizard: Name and Location</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps043.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps043.htm index b9a2fca30..de932ce5c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps043.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps043.htm @@ -122,7 +122,7 @@ <h1>New Servlet Wizard: Name and Location</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps044.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps044.htm index f8080f4ef..27d514816 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps044.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps044.htm @@ -110,7 +110,7 @@ <h1>New Servlet Wizard: Configure Servlet Deployment</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps045.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps045.htm index 93ebc1fe7..0bf7bbfe6 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps045.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_apps045.htm @@ -113,7 +113,7 @@ <h1>New WebSocket Endpoint Wizard: Create WebSocket Endpoint</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk.htm index d3438845a..908b83c58 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk.htm @@ -45,7 +45,7 @@ <h1>Web Frameworks</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk001.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk001.htm index 72c01ec8c..88fd9f9bb 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk001.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk001.htm @@ -65,7 +65,7 @@ <h1>New Grails Artifact Wizard</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk002.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk002.htm index 8777fcdbf..b3088d915 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk002.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk002.htm @@ -92,7 +92,7 @@ <h1>New Grails Application Wizard</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk003.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk003.htm index e763e1c74..1f3b8030a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk003.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk003.htm @@ -112,7 +112,7 @@ <h1>Add Managed Bean Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk004.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk004.htm index 5667ae2d5..dd6f53a98 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk004.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk004.htm @@ -118,7 +118,7 @@ <h1>Add Navigation Case Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk005.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk005.htm index 4c7a43065..dcefb1b47 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk005.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk005.htm @@ -86,7 +86,7 @@ <h1>Add Navigation Rule Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk006.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk006.htm index 953743d87..c13c64946 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk006.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk006.htm @@ -131,7 +131,7 @@ <h1>New Validation Constraint Wizard: Name and Location</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk007.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk007.htm index 5312069e2..36322e1c0 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk007.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk007.htm @@ -102,7 +102,7 @@ <h1>New JSF Pages from Entity Class Wizard: Entity Classes</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk008.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk008.htm index 99196c2d6..f94f64f19 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk008.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk008.htm @@ -151,7 +151,7 @@ <h1>New JSF Pages from Entity Class Wizard: Generate JSF Pages and Classes</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk009.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk009.htm index dd0f4d72b..9df30ce9c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk009.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk009.htm @@ -156,7 +156,7 @@ <h1>New JSF Managed Bean Wizard: Name and Location</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk010.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk010.htm index b6ceebf67..c4119d19a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk010.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk010.htm @@ -118,7 +118,7 @@ <h1>New Facelets Template Wizard: Name and Location</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk011.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk011.htm index 38eee9020..392eff3dd 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk011.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk011.htm @@ -123,7 +123,7 @@ <h1>New Facelets Template Client Wizard: Name and Location</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk012.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk012.htm index 9af8c5f3c..953ca0637 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk012.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk012.htm @@ -67,7 +67,7 @@ <h1>Select RichFaces Library Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk013.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk013.htm index e07eeb3ec..9c9057ff2 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk013.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk013.htm @@ -143,7 +143,7 @@ <h1>Add Action Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk014.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk014.htm index d80b11703..90510e64c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk014.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk014.htm @@ -150,7 +150,7 @@ <h1>Add Exception Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk015.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk015.htm index 4fd21ea19..ff12c3b49 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk015.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk015.htm @@ -108,7 +108,7 @@ <h1>Add ActionForm Bean Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk016.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk016.htm index 7731150c2..9d61f462a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk016.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk016.htm @@ -120,7 +120,7 @@ <h1>Add ActionForm Bean Property Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk017.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk017.htm index 96309919f..c67f7cd90 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk017.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk017.htm @@ -139,7 +139,7 @@ <h1>Add Forward Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk018.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk018.htm index 8642c7e37..0af1357ca 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk018.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk018.htm @@ -161,7 +161,7 @@ <h1>Add Forward/Include Action Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk019.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk019.htm index 9df077fdd..789481b7b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk019.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk019.htm @@ -164,7 +164,7 @@ <h1>New Struts Action Wizard: Name and Location</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk020.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk020.htm index 7c5c10a3b..33941296c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk020.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk020.htm @@ -131,7 +131,7 @@ <h1>New Struts Action Wizard: ActionForm Bean, Parameter</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk021.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk021.htm index 1d63e6c51..d7bd75fd5 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk021.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_web_fmwk021.htm @@ -151,7 +151,7 @@ <h1>New Struts ActionForm Bean Wizard: Name and Location</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans.htm index a9b01ce3a..f0c8f91c1 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans.htm @@ -45,7 +45,7 @@ <h1>Working with NetBeans</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans001.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans001.htm index 44f1a7327..5787a469d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans001.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans001.htm @@ -150,7 +150,7 @@ <h1>Options Window: General</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans002.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans002.htm index 0fb150f3c..ac340555d 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans002.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans002.htm @@ -115,7 +115,7 @@ <h1>Editor Options: General</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans003.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans003.htm index 7b2748a37..a470f91cf 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans003.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans003.htm @@ -109,7 +109,7 @@ <h1>Editor Options: Folding</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans004.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans004.htm index 4185615f1..e94b0e487 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans004.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans004.htm @@ -341,7 +341,7 @@ <h1>Editor Options: Formatting</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans005.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans005.htm index e3a80f882..c5496aa72 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans005.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans005.htm @@ -549,7 +549,7 @@ <h1>Editor Options: Code Completion</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans006.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans006.htm index b2b04f81d..55e78aaea 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans006.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans006.htm @@ -135,7 +135,7 @@ <h1>Editor Options: Code Templates</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans007.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans007.htm index 56642b7cc..91df25aab 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans007.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans007.htm @@ -103,7 +103,7 @@ <h1>Editor Options: Hints</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans008.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans008.htm index 24ed794d7..6541531c1 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans008.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans008.htm @@ -91,7 +91,7 @@ <h1>Editor Options: Highlighting</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans009.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans009.htm index 136f40f82..def73fe41 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans009.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans009.htm @@ -103,7 +103,7 @@ <h1>Editor Options: Macros</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans010.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans010.htm index 0389fa4ab..d8c822fa3 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans010.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans010.htm @@ -104,7 +104,7 @@ <h1>Editor Options: On Save</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans011.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans011.htm index b2e5e6016..a1ce66f8b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans011.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans011.htm @@ -93,7 +93,7 @@ <h1>Editor Options: Spellchecker</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans012.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans012.htm index 462298180..e65e619e7 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans012.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans012.htm @@ -193,7 +193,7 @@ <h1>Options Window: Fonts and Colors</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans013.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans013.htm index 4d6bfdf3e..070d160bb 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans013.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans013.htm @@ -110,7 +110,7 @@ <h1>Options Window: Keymap</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans014.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans014.htm index 4d54fee72..e430737f6 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans014.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans014.htm @@ -116,7 +116,7 @@ <h1>Manage Keymap Profiles Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans015.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans015.htm index 441d623ed..d1fc294a4 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans015.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans015.htm @@ -109,7 +109,7 @@ <h1>Options Window: Team: Action Items</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans016.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans016.htm index c4ef72305..8206bb196 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans016.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans016.htm @@ -121,7 +121,7 @@ <h1>Options Window: Miscellaneous: CSS Preprocessors</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans017.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans017.htm index 93a71081f..b2d834da9 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans017.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans017.htm @@ -87,7 +87,7 @@ <h1>Options Window: Miscellaneous: Diff</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans018.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans018.htm index b4090bccc..aba717c4a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans018.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans018.htm @@ -135,7 +135,7 @@ <h1>Options Window: Miscellaneous: Files</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans019.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans019.htm index 2bb329d2f..8a90d1771 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans019.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans019.htm @@ -110,7 +110,7 @@ <h1>Options Window: Team: Tasks</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans020.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans020.htm index f61b031be..4097fb7bf 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans020.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans020.htm @@ -93,7 +93,7 @@ <h1>Options Window: Miscellaneous: Mobile Platforms</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans021.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans021.htm index 01bf97107..71ecd6821 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans021.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans021.htm @@ -135,7 +135,7 @@ <h1>Options Window: Miscellaneous: Output</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans022.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans022.htm index 7206c61e4..77dd3ee85 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans022.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans022.htm @@ -151,7 +151,7 @@ <h1>Options Window: Miscellaneous: Terminal</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans023.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans023.htm index 3f3167ded..d2c0c991b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans023.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans023.htm @@ -198,7 +198,7 @@ <h1>Options Window: Miscellaneous: Versioning</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans024.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans024.htm index 541304d03..345aec26b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans024.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans024.htm @@ -110,7 +110,7 @@ <h1>Options Window: Appearance: Windows</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans025.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans025.htm index 1d2ff81ca..2cd080c35 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans025.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans025.htm @@ -127,7 +127,7 @@ <h1>Options Window: Appearance: Document Tabs</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans026.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans026.htm index d9f447da5..1ca56cf69 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans026.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans026.htm @@ -85,7 +85,7 @@ <h1>Options Window: Appearance: Look and Feel</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans027.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans027.htm index 3e7454ae5..9d91fc414 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans027.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans027.htm @@ -80,7 +80,7 @@ <h1>Tasks: Blocks Task Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans028.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans028.htm index fd6327c11..ba54a585a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans028.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans028.htm @@ -123,7 +123,7 @@ <h1>Tasks: Create Task Repository Dialog Box: Bugzilla</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans029.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans029.htm index 53d3d5668..6e3ab66fe 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans029.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans029.htm @@ -78,7 +78,7 @@ <h1>Tasks: Duplicate Task Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans030.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans030.htm index 5b26733c0..33e9c4884 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans030.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans030.htm @@ -58,7 +58,7 @@ <h1>Tasks: Task Repository Server Response Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans031.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans031.htm index e05e1b0cd..9d82754a3 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans031.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans031.htm @@ -78,7 +78,7 @@ <h1>Tasks: Task Depends On Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans032.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans032.htm index fbe4ac34b..cd174df81 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans032.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans032.htm @@ -118,7 +118,7 @@ <h1>Tasks: Create Task Repository Dialog Box: JIRA</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans033.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans033.htm index 3ce7640b0..5991238b2 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans033.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans033.htm @@ -57,7 +57,7 @@ <h1>Tasks: Apply Patch Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans034.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans034.htm index ea6a7468c..f4b27c9bd 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans034.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans034.htm @@ -58,7 +58,7 @@ <h1>Tasks: Resolve Task Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans035.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans035.htm index 57f2ca2f7..d347134f7 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans035.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans035.htm @@ -78,7 +78,7 @@ <h1>Tasks: Save Query Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans036.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans036.htm index d773c907f..09f14f6e2 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans036.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans036.htm @@ -79,7 +79,7 @@ <h1>Tasks: Select Keyword Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans037.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans037.htm index 5f3498f58..be12d2fc2 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans037.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans037.htm @@ -102,7 +102,7 @@ <h1>Tasks: Modify Templates Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans038.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans038.htm index b80c54204..9c0e05513 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans038.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans038.htm @@ -91,7 +91,7 @@ <h1>Plugins Manager: Downloaded</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans039.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans039.htm index 0720e71ff..bb8d20ed3 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans039.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans039.htm @@ -130,7 +130,7 @@ <h1>Plugins Manager: Installed</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans040.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans040.htm index 0375ba056..3c87de4be 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans040.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans040.htm @@ -91,7 +91,7 @@ <h1>Plugins Manager: Available Plugins</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans041.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans041.htm index 6c7f7e13a..0343264eb 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans041.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans041.htm @@ -121,7 +121,7 @@ <h1>Plugins Manager: Settings</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans042.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans042.htm index 028335824..5de75647e 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans042.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans042.htm @@ -92,7 +92,7 @@ <h1>Plugins Manager: Updates</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans043.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans043.htm index ce4bb02af..0102ff257 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans043.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans043.htm @@ -91,7 +91,7 @@ <h1>Customize Toolbars Window</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans044.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans044.htm index d6aa40a8d..7b5ce88e7 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans044.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans044.htm @@ -92,7 +92,7 @@ <h1>Bookmarks Window</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans045.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans045.htm index ca0053305..542a7e0bd 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans045.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans045.htm @@ -252,7 +252,7 @@ <h1>Navigator Window</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans046.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans046.htm index 9df9445d1..2b6656d12 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans046.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans046.htm @@ -203,7 +203,7 @@ <h1>General Editor Window</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans047.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans047.htm index 587c671b1..7d7485f5c 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans047.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans047.htm @@ -377,7 +377,7 @@ <h1>Project Properties: Formatting</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans048.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans048.htm index 636e6db33..c5888ce62 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans048.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans048.htm @@ -91,7 +91,7 @@ <h1>Add Web Service Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans049.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans049.htm index 122c1783d..e380d610b 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans049.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans049.htm @@ -110,7 +110,7 @@ <h1>Documents Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans050.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans050.htm index 13ff7dc75..c909ec4bd 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans050.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans050.htm @@ -109,7 +109,7 @@ <h1>Properties Window</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans051.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans051.htm index dc3f657da..37f0792d4 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans051.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans051.htm @@ -177,7 +177,7 @@ <h1>Services Window</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans052.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans052.htm index 5c3c3609c..1a5ef9feb 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans052.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans052.htm @@ -91,7 +91,7 @@ <h1>Save Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans053.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans053.htm index b3b70d668..99ee64ff8 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans053.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans053.htm @@ -133,7 +133,7 @@ <h1>Replace in Projects Dialog</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans054.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans054.htm index 5dee624f8..629dbafdd 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans054.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans054.htm @@ -157,7 +157,7 @@ <h1>Find in Projects Dialog</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans055.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans055.htm index 567042918..4921ec4c7 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans055.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans055.htm @@ -87,7 +87,7 @@ <h1>Select The Diff Patch Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans056.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans056.htm index 74e756aec..6dac6886f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans056.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans056.htm @@ -103,7 +103,7 @@ <h1>Action Items Window</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans057.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans057.htm index c02d9002f..ae589b161 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans057.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans057.htm @@ -204,7 +204,7 @@ <h1>HTML and JSP Source Editor</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans058.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans058.htm index 57151d69a..11cca9e9a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans058.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans058.htm @@ -281,7 +281,7 @@ <h1>History View</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans059.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans059.htm index 4ab460589..1766ef135 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans059.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans059.htm @@ -96,7 +96,7 @@ <h1>Ant Library Manager</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans060.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans060.htm index fdfe1e74c..22b149f29 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans060.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans060.htm @@ -59,7 +59,7 @@ <h1>Favorites Window</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans061.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans061.htm index 09fe57f64..222b0f171 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans061.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans061.htm @@ -216,7 +216,7 @@ <h1>Files Window</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans062.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans062.htm index 39f34774a..4dd6acf21 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans062.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans062.htm @@ -105,7 +105,7 @@ <h1>Project Group: Create New Group Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans063.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans063.htm index 7202da626..71a70cfa6 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans063.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans063.htm @@ -180,7 +180,7 @@ <h1>Projects Window</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans064.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans064.htm index 4ee471d2f..02ca8064a 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans064.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans064.htm @@ -90,7 +90,7 @@ <h1>New Project Wizard: Choose Project</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans065.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans065.htm index 52ce88769..1b2786e68 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans065.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans065.htm @@ -86,7 +86,7 @@ <h1>Web Browser Window</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans066.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans066.htm index 6462249cf..ed9bbed84 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans066.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans066.htm @@ -129,7 +129,7 @@ <h1>Options Window: General: Web Browsers Manager</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans067.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans067.htm index b07cf0ea7..07fc76b17 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans067.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans067.htm @@ -79,7 +79,7 @@ <h1>Shelved Changes Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans068.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans068.htm index 740c07473..18bdaf9ff 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans068.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans068.htm @@ -52,7 +52,7 @@ <h1>Waiting for Tasks to Finish Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans069.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans069.htm index 3d1b6b97a..b4fa12a48 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans069.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans069.htm @@ -59,7 +59,7 @@ <h1>Output Window</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans070.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans070.htm index fb6524a97..3bf699d8f 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans070.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans070.htm @@ -86,7 +86,7 @@ <h1>Login to netbeans.org Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans071.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans071.htm index c8defcbf1..ac32f82d1 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans071.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans071.htm @@ -299,7 +299,7 @@ <h1>Using the IDE Help System</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans072.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans072.htm index 85b6fc269..fbbba4919 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans072.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans072.htm @@ -32,20 +32,36 @@ <h1>Legal Notices</h1> <a name="BEGIN" id="BEGIN"></a> <p>DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.</p> -<p>Copyright &copy; 1997, 2016, Oracle and/or its affiliates. All rights reserved.</p> -<p>Oracle and Java are registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.</p> -<p>The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common Development and Distribution License("CDDL") (collectively, the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the License at <code dir="ltr"> + +<p> +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at +</p> + +<p> +<code dir="ltr"> <object classid="java:org.netbeans.modules.javahelp.BrowserDisplayer"> -<param name="content" value="http://www.netbeans.org/cddl-gplv2.html"> -<param name="text" value="<html><u>http://www.netbeans.org/cddl-gplv2.html</u></html>"> +<param name="content" value="http://www.apache.org/licenses/LICENSE-2.0"> +<param name="text" value="<html><u>http://www.apache.org/licenses/LICENSE-2.0</u></html>"> <param name="textFontSize" value="medium"> <param name="textColor" value="blue"> </object> -</code> or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the specific language governing permissions and limitations under the License. When distributing the software, include this License Header Notice in each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this particular file as subject to the "Classpath" exception as provided by Oracle in the GPL Version 2 section of the License file that accompanied this code. If applicable, add the following below the License Header, with the fields enclosed by brackets [] replaced by your own identifying information: "Portions Copyrighted [year] [name of copyright owner]"</p> -<p>Contributor(s):</p> -<p>The original software is NetBeans. The initial developer of the original software was Sun Microsystems, Inc.; portions copyright 1997-2006 Sun Microsystems, Inc. All rights reserved.</p> -<p>If you wish your version of this file to be governed by only the CDDL or only the GPL Version 2, indicate your decision by adding "[Contributor] elects to include this software in this distribution under the [CDDL or GPL Version 2] license." If you do not indicate a single choice of license, a recipient has the option to distribute your version of this file under either the CDDL, the GPL Version 2 or to extend the choice of license to its licensees as provided above. However, if you add GPL Version 2 code and therefore, elected the GPL Version 2 license, then the option applies only if the new code is made subject to such option by the copyright holder.</p> -<p>Oracle is not responsible for the availability of third-party Web sites mentioned in this document. Oracle does not endorse and is not responsible or liable for any content, advertising, products, or other materials on or available from such sites or resources. Oracle will not be responsible or liable for any damage or loss caused or alleged to be caused by or in connection with use of or reliance on any such content, goods, or services available on or through any such sites or resources.</p> +</code> +</p> + +<p> +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +</p> <!-- --> <!-- Start Footer --> @@ -54,7 +70,7 @@ <h1>Legal Notices</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans073.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans073.htm index c2ea51dd1..c902b4033 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans073.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans073.htm @@ -92,7 +92,7 @@ <h1>Internationalization Wizard</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans074.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans074.htm index 38142b8ef..93318ba16 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans074.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans074.htm @@ -84,7 +84,7 @@ <h1>Notifications Window</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans075.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans075.htm index 0b4e9956f..705820fb2 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans075.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans075.htm @@ -199,7 +199,7 @@ <h1>Tasks Window</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans076.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans076.htm index febe032c5..ca4624384 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans076.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_working_netbeans076.htm @@ -138,7 +138,7 @@ <h1>Javadoc Index Search Window</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_xml.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_xml.htm index faeaa906e..e329c0aca 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_xml.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_xml.htm @@ -45,7 +45,7 @@ <h1>Using XML</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_xml001.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_xml001.htm index 5e5419618..8e9a7f791 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_xml001.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_xml001.htm @@ -205,7 +205,7 @@ <h1>About the XML Source Editor</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_xml002.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_xml002.htm index 8ab1895fd..17886f154 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_xml002.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_xml002.htm @@ -97,7 +97,7 @@ <h1>Add Catalog Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_xml003.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_xml003.htm index 74089a77c..9bf6b9fb3 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_xml003.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_xml003.htm @@ -115,7 +115,7 @@ <h1>XSL Transformation Dialog Box</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_xml004.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_xml004.htm index c118e7342..d5be20132 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/f1_xml004.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/f1_xml004.htm @@ -196,7 +196,7 @@ <h1>XML Editor Toolbar</h1> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/prefacehelp.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/prefacehelp.htm index c32c49c9d..52c4d63ff 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/prefacehelp.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/prefacehelp.htm @@ -97,7 +97,7 @@ <h2>Conventions</h2> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2016,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> diff --git a/usersguide/javahelp/org/netbeans/modules/usersguide/titlehelp.htm b/usersguide/javahelp/org/netbeans/modules/usersguide/titlehelp.htm index ec54fa931..7731878e1 100755 --- a/usersguide/javahelp/org/netbeans/modules/usersguide/titlehelp.htm +++ b/usersguide/javahelp/org/netbeans/modules/usersguide/titlehelp.htm @@ -37,23 +37,33 @@ <h1>NetBeans</h1> <hr /> <p>NetBeans IDE Online Help</p> <p>E80915-01</p> -<p>Copyright &copy; 2013, 2017&nbsp;Oracle and/or its affiliates. All rights reserved.</p> -<p>Primary Author: Alyona Stashkova, Catherine Pickersgill, Akhilesh Swarnkaar</p> -<p>This software and related documentation are provided under a license agreement containing restrictions on use and disclosure and are protected by intellectual property laws. Except as expressly permitted in your license agreement or allowed by law, you may not use, copy, reproduce, translate, broadcast, modify, license, transmit, distribute, exhibit, perform, publish, or display any part, in any form, or by any means. Reverse engineering, disassembly, or decompilation of this software, unless required by law for interoperability, is prohibited.</p> -<p>The information contained herein is subject to change without notice and is not warranted to be error-free. If you find any errors, please report them to us in writing.</p> -<p>If this is software or related documentation that is delivered to the U.S. Government or anyone licensing it on behalf of the U.S. Government, then the following notice is applicable:</p> -<p>U.S. GOVERNMENT END USERS: Oracle programs, including any operating system, integrated software, any programs installed on the hardware, and/or documentation, delivered to U.S. Government end users are "commercial computer software" pursuant to the applicable Federal Acquisition Regulation and agency-specific supplemental regulations. As such, use, duplication, disclosure, modification, and adaptation of the programs, including any operating system, integrated software, any programs installed on the hardware, and/or documentation, shall be subject to license terms and license restrictions applicable to the programs. No other rights are granted to the U.S. Government.</p> -<p>This software or hardware is developed for general use in a variety of information management applications. It is not developed or intended for use in any inherently dangerous applications, including applications that may create a risk of personal injury. If you use this software or hardware in dangerous applications, then you shall be responsible to take all appropriate fail-safe, backup, redundancy, and other measures to ensure its safe use. Oracle Corporation and its affiliates disclaim any liability for any damages caused by use of this software or hardware in dangerous applications.</p> -<p>Oracle and Java are registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.</p> -<p>Intel and Intel Xeon are trademarks or registered trademarks of Intel Corporation. All SPARC trademarks are used under license and are trademarks or registered trademarks of SPARC International, Inc. AMD, Opteron, the AMD logo, and the AMD Opteron logo are trademarks or registered trademarks of Advanced Micro Devices. UNIX is a registered trademark of The Open Group.</p> -<p>This software or hardware and documentation may provide access to or information about content, products, and services from third parties. Oracle Corporation and its affiliates are not responsible for and expressly disclaim all warranties of any kind with respect to third-party content, products, and services unless otherwise set forth in an applicable agreement between you and Oracle. Oracle Corporation and its affiliates will not be responsible for any loss, costs, or damages incurred due to your access to or use of third-party content, products, or services, except as set forth in an applicable agreement between you and Oracle.</p> +<p> + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at +</p> +<p> + http://www.apache.org/licenses/LICENSE-2.0 +</p> +<p> + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +</p> <!-- Start Footer --> <table summary="" cellspacing="0" cellpadding="0" width="100%"> <tr> <td align="left" width="86%"><a href="legal_notice.htm"> -Copyright&nbsp;&copy;&nbsp;2017,&nbsp;Oracle&nbsp;and/or&nbsp;its&nbsp;affiliates.&nbsp;All&nbsp;rights&nbsp;reserved.</a> +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> </td> </tr> </table> ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          785. matthiasblaesing opened a new pull request #311: [NETBEANS-54] Various module reviews URL: https://github.com/apache/incubator-netbeans/pull/311 - Removed unused files without license headers - Added various headers - Added various exclusions With this we are down to only one module: hibernate. The hibernate XSDs are only licensed under LGPL and so can't be included. I would not add them to the excludes. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          786. geertjanw commented on issue #311: [NETBEANS-54] Various module reviews URL: https://github.com/apache/incubator-netbeans/pull/311#issuecomment-348637305 Awesome, merging. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          787. geertjanw closed pull request #311: [NETBEANS-54] Various module reviews URL: https://github.com/apache/incubator-netbeans/pull/311 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/css.editor/todo b/css.editor/todo index b72e8caf8..1ca059e31 100644 --- a/css.editor/todo +++ b/css.editor/todo @@ -1,3 +1,6 @@ +Licensed to the Apache Software Foundation (ASF) under one or more contributor +license agreements; and to You under the Apache License, Version 2.0. + Css modules list (source http://www.css3.info/modules/) * Selectors diff --git a/java.hints/build.xml b/java.hints/build.xml index be6dfb4b2..d73020e16 100644 --- a/java.hints/build.xml +++ b/java.hints/build.xml @@ -20,13 +20,5 @@ --> <project name="java.hints" default="netbeans" basedir="."> - <import file="../nbbuild/templates/projectized.xml"/> - - <target name="test" depends="pre-test,projectized-common.test"> - </target> - - <target name="pre-test"> - <property name="test.unit.excludes.files" location="test-excludes.txt"/> - </target> - + <import file="../nbbuild/templates/projectized.xml"/> </project> diff --git a/java.hints/test-excludes.txt b/java.hints/test-excludes.txt deleted file mode 100644 index beb5f9e05..000000000 --- a/java.hints/test-excludes.txt +++ /dev/null @@ -1 +0,0 @@ -**/JavaHintsProviderTest* diff --git a/java.hints/test/unit/src/org/netbeans/modules/java/hints/errors/Class.template b/java.hints/test/unit/src/org/netbeans/modules/java/hints/errors/Class.template index 864746b92..e7172a25c 100644 --- a/java.hints/test/unit/src/org/netbeans/modules/java/hints/errors/Class.template +++ b/java.hints/test/unit/src/org/netbeans/modules/java/hints/errors/Class.template @@ -1,3 +1,21 @@ +<#-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> <#if package?? && package != ""> package ${package}; diff --git a/java.hints/test/unit/src/org/netbeans/modules/java/hints/infrastructure/ErrorHintsProviderTest.java b/java.hints/test/unit/src/org/netbeans/modules/java/hints/infrastructure/ErrorHintsProviderTest.java index ec8cdd969..35e661650 100644 --- a/java.hints/test/unit/src/org/netbeans/modules/java/hints/infrastructure/ErrorHintsProviderTest.java +++ b/java.hints/test/unit/src/org/netbeans/modules/java/hints/infrastructure/ErrorHintsProviderTest.java @@ -60,12 +60,6 @@ public ErrorHintsProviderTest(String testName) { super(testName); } -// public static Test suite() { -// TestSuite suite = new TestSuite(JavaHintsProviderTest.class); -// -// return suite; -// } - private FileObject testSource; private JavaSource js; private CompilationInfo info; diff --git a/java.navigation/test/log.txt b/java.navigation/test/log.txt deleted file mode 100644 index c3f893856..000000000 --- a/java.navigation/test/log.txt +++ /dev/null @@ -1 +0,0 @@ -ant -verbose -Dnetbeans.dest.dir=/home/pzajac/builds/netbeans -Dxtest.testtype=qa-functional -Dxtest.attribs=validation diff --git a/java.source/build.xml b/java.source/build.xml index 262ea1328..b2c518f73 100644 --- a/java.source/build.xml +++ b/java.source/build.xml @@ -22,13 +22,5 @@ <project basedir="." default="netbeans" name="java.source"> <import file="../nbbuild/templates/projectized.xml"/> <property name="nb.modules.dir" value="modules"/> - - <target name="test" depends="pre-test,projectized-common.test"> - </target> - - <target name="pre-test"> - <property name="test.unit.excludes.files" location="test-excludes.txt"/> - </target> - </project> diff --git a/java.source/test-excludes.txt b/java.source/test-excludes.txt deleted file mode 100644 index c5f1fdb99..000000000 --- a/java.source/test-excludes.txt +++ /dev/null @@ -1,18 +0,0 @@ -**/CachingFileManagerTest* -**/CachingZipArchiveTest* -**/BasicPerformanceTest* -**/CachingFolderArchiveTest* -**/GeneratorTest* -**/FileManagerTest* -**/PerfJavacIntefaceGCTest* -**/PerfResolveTest* -**/PerfBatchCompilationTest* -**/AnnotationOnLocVarTest* -**/ClashingImportsTest* -**/ImportFormatTest* -**/LabelsTest* -**/MemberAdditionTest* -**/MethodBodyTextTest* -**/UiUtilsTest* -**/RepositoryUpdaterTest* -**/ClassIndexTest* \ No newline at end of file diff --git a/jshell.support/src/org/netbeans/modules/jshell/resources/ShellClass.java.template b/jshell.support/src/org/netbeans/modules/jshell/resources/ShellClass.java.template index 9a193f2d3..06883b35e 100644 --- a/jshell.support/src/org/netbeans/modules/jshell/resources/ShellClass.java.template +++ b/jshell.support/src/org/netbeans/modules/jshell/resources/ShellClass.java.template @@ -1,3 +1,23 @@ +<#-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> <#assign licenseFirst = "/*"> <#assign licensePrefix = " * "> <#assign licenseLast = " */"> diff --git a/lib.profiler/test/qa-functional/coverage.txt b/lib.profiler/test/qa-functional/coverage.txt index 4979f1e44..6ea59405d 100644 --- a/lib.profiler/test/qa-functional/coverage.txt +++ b/lib.profiler/test/qa-functional/coverage.txt @@ -1,3 +1,6 @@ +Licensed to the Apache Software Foundation (ASF) under one or more contributor +license agreements; and to You under the Apache License, Version 2.0. + What functionality the functional tests cover. Test of calibration diff --git a/nbbuild/build.xml b/nbbuild/build.xml index 120e4c74e..4e65b5c14 100644 --- a/nbbuild/build.xml +++ b/nbbuild/build.xml @@ -2051,7 +2051,7 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <exclude name="**/nbproject/jfx-impl.xml" /> <!--generated, no degree of creativity --> <exclude name="**/nbproject/private/**" /> <!--user-specific files --> <exclude name="**/src/META-INF/**" /> <!--no degree of creativity--> - <exclude name="*/build/**" /> + <exclude name="**/build/**" /> <!-- build artifacts --> <exclude name="**/.dep.inc" /> <!--no degree of creativity--> <exclude name="**/Makefile-vc" /> <!--no degree of creativity--> <exclude name="**/Makefile-vc-wo-crt" /> <!--no degree of creativity--> @@ -2067,7 +2067,6 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <exclude name="beans/src/org/netbeans/modules/beans/resources/templates/*.template" /> <!--license would be visible when users edit the templates inside their IDE--> <exclude name="css.editor/src/org/netbeans/modules/css/resources/CascadeStyleSheet.css.template" /> <!-- user visible template --> <exclude name="css.editor/src/org/netbeans/modules/css/resources/CssExample" /> <!-- user visible template --> - <exclude name="css.editor/todo" /> <!-- no degree of creativity --> <exclude name="debugger.jpda/test/unit/src/org/netbeans/api/debugger/jpda/testapps/JspLineBreakpointApp.txt" /> <!-- test data --> <exclude name="diff/test/unit/src/org/netbeans/modules/diff/builtin/provider/*.txt" /> <!--test data--> <exclude name="diff/test/unit/src/org/netbeans/modules/diff/builtin/visualizer/data/**" /> <!--test data--> @@ -2102,15 +2101,18 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <exclude name="java.j2semodule/src/org/netbeans/modules/java/j2semodule/ui/resources/module-info.java.template" /> <!--template file--> <exclude name="java.platform.ui/src/org/netbeans/modules/java/platform/resources/templates/javaplatform.xml" /> <!--template file--> <exclude name="java.project.ui/src/org/netbeans/modules/java/project/ui/resources/*.template" /> <!-- template files --> - <exclude name="java.source/test-excludes.txt" /> <!-- test context --> <exclude name="java.source/src/org/netbeans/modules/**/*.template" /> <!-- template files --> <exclude name="javafx2.project/src/org/netbeans/modules/javafx2/project/templates/**" /> <!--license would be visible when users edit the templates inside their IDE--> - <exclude name="javawebstart/AntTasks/build/**" /> <!-- generated build files --> <exclude name="jellytools.platform/src/org/netbeans/jellytools/version_info" /> <!--does not natively support comments--> + <exclude name="jshell.support/src/org/netbeans/modules/jshell/resources/consoleExample.jsh" /> <!-- file is used as sample for syntax highlighting in GUI --> + <exclude name="jshell.support/test/unit/src/org/netbeans/modules/jshell/support/*.txt" /> <!--test data--> <exclude name="junit.ui/src/org/netbeans/modules/junit/ui/resources/*.template" /> <!--license would be visible when users edit the templates inside their IDE--> <exclude name="languages.diff/src/org/netbeans/modules/languages/diff/DiffExample.diff" /> <!--license would be visible to users in the Fonts/Colors settings--> <exclude name="languages.yaml/src/org/netbeans/modules/languages/yaml/*.yaml" /> <!--Files used in GUI as sample/starting point--> <exclude name="languages.yaml/src/org/netbeans/modules/languages/yaml/*.yml" /> <!--Files used in GUI as sample/starting point--> + <exclude name="lexer/demo/src/org/netbeans/modules/lexer/demo/**/*.txt" /> <!-- test data --> + <exclude name="lib.profiler/test/unit/src/org/netbeans/lib/profiler/heap/testHeapDumpLog.txt" /> <!--test data--> + <exclude name="lib.profiler/release/lib/deployed/**/*.map" /> <!-- companion files for CDDL licensed binaries --> <exclude name="lib.uihandler/src/org/netbeans/lib/uihandler/pubKey" /> <!--no degree of creativity--> <exclude name="lib.uihandler/test/unit/src/**" /> <!--test data--> <exclude name="maven.htmlui/src/org/netbeans/modules/maven/htmlui/UIDefaults" /> <!-- config file with no place for license header--> @@ -2129,8 +2131,6 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <exclude name="o.apache.tools.ant.module/src/org/apache/tools/ant/module/resources/CustomTask_java" /> <!-- user visible file template --> <exclude name="o.apache.tools.ant.module/src/org/apache/tools/ant/module/resources/Project.xml_" /> <!-- user visible file template --> <exclude name="o.n.bootstrap/readme/*.txt" /> <!--READMEs--> - <exclude name="o.n.bootstrap/test/unit/src/org/fakepkg/resource1.txt" /> <!--no degree of creativity--> - <exclude name="o.n.bootstrap/test/unit/src/org/fakepkg/resource2.txt" /> <!--no degree of creativity--> <exclude name="o.n.core/licenses/**" /> <!-- license files --> <exclude name="o.n.core/test/unit/src/org/netbeans/core/modules/jars/localized-manifest/locmani/something.txt" /> <!--no degree of creativity--> <exclude name="o.n.core/test/unit/src/org/netbeans/core/projects/cache/data/**" /> <!-- test data --> @@ -2142,9 +2142,9 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <exclude name="openide.util.lookup/test/unit/src/org/openide/util/lookup/services-jar-2.txt" /> <!--no degree of creativity--> <exclude name="openide.util.ui/test/unit/src/org/openide/util/UtilitiesTranslateEmpty.txt" /> <!-- license would cause tests to fail --> <exclude name="openide.util/test/unit/src/org/openide/util/LookupUsesRequestProcessorTest.resource" /> <!-- license would cause tests to fail --> - <exclude name="options.editor/src/org/netbeans/modules/options/colors/AllLanguagesExample" /> <!--no degree of creativitya--> - <exclude name="options.editor/src/org/netbeans/modules/options/colors/HighlightingExample" /> <!--no degree of creativitya--> - <exclude name="options.editor/src/org/netbeans/modules/options/indentation/indentationExample" /> <!--no degree of creativitya--> + <exclude name="options.editor/src/org/netbeans/modules/options/colors/AllLanguagesExample" /> <!--no degree of creativity--> + <exclude name="options.editor/src/org/netbeans/modules/options/colors/HighlightingExample" /> <!--no degree of creativity--> + <exclude name="options.editor/src/org/netbeans/modules/options/indentation/indentationExample" /> <!--no degree of creativity--> <exclude name="projectui/src/org/netbeans/modules/project/ui/resources/*-license.txt" /> <!--licenses--> <exclude name="projectui/src/org/netbeans/modules/project/ui/resources/license-default.txt" /> <!--licenses--> <exclude name="projectuiapi/test/unit/src/org/netbeans/modules/project/uiapi/data/*.txt" /> <!--test data--> diff --git a/o.n.bootstrap/test/unit/src/org/fakepkg/resource1.txt b/o.n.bootstrap/test/unit/src/org/fakepkg/resource1.txt index 651c9de60..6b1b1ed1e 100644 --- a/o.n.bootstrap/test/unit/src/org/fakepkg/resource1.txt +++ b/o.n.bootstrap/test/unit/src/org/fakepkg/resource1.txt @@ -1 +1,4 @@ +Licensed to the Apache Software Foundation (ASF) under one or more contributor +license agreements; and to You under the Apache License, Version 2.0. + first dummy resource diff --git a/o.n.bootstrap/test/unit/src/org/fakepkg/resource2.txt b/o.n.bootstrap/test/unit/src/org/fakepkg/resource2.txt index 295fb5d88..6cca230b7 100644 --- a/o.n.bootstrap/test/unit/src/org/fakepkg/resource2.txt +++ b/o.n.bootstrap/test/unit/src/org/fakepkg/resource2.txt @@ -1 +1,4 @@ +Licensed to the Apache Software Foundation (ASF) under one or more contributor +license agreements; and to You under the Apache License, Version 2.0. + second dummy resource ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org
          788. [~GeertjanWielenga], [~bdelacretaz] What is the current status of this mega issue? It has not been updated 12/07/2017. Please resolve/close it if its possible!
          789. Good point. I think this issue can be closed once we have graduated from the Apache incubator. Since that can only be done once each and every license-related issue is solved, the fact that we'll be a top level Apache project will be evidence that we can close this specific issue as resolved.
          790. I'm closing this one as we have graduated.